Remove encrypted fields

Author: sungwoncho

migrate.go

@@ -177,8 +177,8 @@ func migrateBooks(pgDB *sql.DB, tx *sql.Tx, stats *MigrationStats) error {
 	defer rows.Close()
 
 	stmt, err := tx.Prepare(`
-		INSERT INTO books (id, created_at, updated_at, uuid, user_id, label, added_on, edited_on, usn, deleted, encrypted)
-		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+		INSERT INTO books (id, created_at, updated_at, uuid, user_id, label, added_on, edited_on, usn, deleted)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 	`)
 	if err != nil {
 		return err
@@ -192,11 +192,12 @@ func migrateBooks(pgDB *sql.DB, tx *sql.Tx, stats *MigrationStats) error {
 		var uuid, label string
 		var deleted, encrypted bool
 
+		// Read encrypted from Postgres but don't write it to SQLite
 		if err := rows.Scan(&id, &createdAt, &updatedAt, &uuid, &userID, &label, &addedOn, &editedOn, &usn, &deleted, &encrypted); err != nil {
 			return err
 		}
 
-		if _, err := stmt.Exec(id, createdAt, updatedAt, uuid, userID, label, addedOn, editedOn, usn, deleted, encrypted); err != nil {
+		if _, err := stmt.Exec(id, createdAt, updatedAt, uuid, userID, label, addedOn, editedOn, usn, deleted); err != nil {
 			return err
 		}
 		stats.Books++
@@ -217,8 +218,8 @@ func migrateNotes(pgDB *sql.DB, tx *sql.Tx, stats *MigrationStats) error {
 	defer rows.Close()
 
 	stmt, err := tx.Prepare(`
-		INSERT INTO notes (id, created_at, updated_at, uuid, user_id, book_uuid, body, added_on, edited_on, public, usn, deleted, encrypted, client)
-		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+		INSERT INTO notes (id, created_at, updated_at, uuid, user_id, book_uuid, body, added_on, edited_on, public, usn, deleted, client)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 	`)
 	if err != nil {
 		return err
@@ -232,11 +233,12 @@ func migrateNotes(pgDB *sql.DB, tx *sql.Tx, stats *MigrationStats) error {
 		var uuid, bookUUID, body, client string
 		var public, deleted, encrypted bool
 
+		// Read encrypted from Postgres but don't write it to SQLite
 		if err := rows.Scan(&id, &createdAt, &updatedAt, &uuid, &userID, &bookUUID, &body, &addedOn, &editedOn, &public, &usn, &deleted, &encrypted, &client); err != nil {
 			return err
 		}
 
-		if _, err := stmt.Exec(id, createdAt, updatedAt, uuid, userID, bookUUID, body, addedOn, editedOn, public, usn, deleted, encrypted, client); err != nil {
+		if _, err := stmt.Exec(id, createdAt, updatedAt, uuid, userID, bookUUID, body, addedOn, editedOn, public, usn, deleted, client); err != nil {
 			return err
 		}
 		stats.Notes++

migrate_test.go

@@ -314,9 +314,6 @@ func TestMigration(t *testing.T) {
 	if sqliteBook1.Deleted != book1.Deleted {
 		t.Errorf("Book1 Deleted: expected %v, got %v", book1.Deleted, sqliteBook1.Deleted)
 	}
-	if sqliteBook1.Encrypted != book1.Encrypted {
-		t.Errorf("Book1 Encrypted: expected %v, got %v", book1.Encrypted, sqliteBook1.Encrypted)
-	}
 	if sqliteBook1.CreatedAt.Unix() != book1.CreatedAt.Unix() {
 		t.Errorf("Book1 CreatedAt: expected %v, got %v", book1.CreatedAt, sqliteBook1.CreatedAt)
 	}
@@ -359,9 +356,6 @@ func TestMigration(t *testing.T) {
 	if sqliteNote1.Deleted != note1.Deleted {
 		t.Errorf("Note1 Deleted: expected %v, got %v", note1.Deleted, sqliteNote1.Deleted)
 	}
-	if sqliteNote1.Encrypted != note1.Encrypted {
-		t.Errorf("Note1 Encrypted: expected %v, got %v", note1.Encrypted, sqliteNote1.Encrypted)
-	}
 	if sqliteNote1.Client != note1.Client {
 		t.Errorf("Note1 Client: expected %s, got %s", note1.Client, sqliteNote1.Client)
 	}

sqlite_models.go

@@ -18,11 +18,10 @@ type SqliteBook struct {
 	UserID    int          `json:"user_id" gorm:"index"`
 	Label     string       `json:"label" gorm:"index"`
 	Notes     []SqliteNote `json:"notes" gorm:"foreignKey:BookUUID;references:UUID"`
-	AddedOn   int64        `json:"added_on"`
-	EditedOn  int64        `json:"edited_on"`
-	USN       int          `json:"-" gorm:"index"`
-	Deleted   bool         `json:"-" gorm:"default:false"`
-	Encrypted bool         `json:"-" gorm:"default:false"`
+	AddedOn  int64 `json:"added_on"`
+	EditedOn int64 `json:"edited_on"`
+	USN      int   `json:"-" gorm:"index"`
+	Deleted  bool  `json:"-" gorm:"default:false"`
 }
 
 func (SqliteBook) TableName() string {
@@ -37,11 +36,10 @@ type SqliteNote struct {
 	Body      string `json:"content"`
 	AddedOn   int64  `json:"added_on"`
 	EditedOn  int64  `json:"edited_on"`
-	Public    bool   `json:"public" gorm:"default:false"`
-	USN       int    `json:"-" gorm:"index"`
-	Deleted   bool   `json:"-" gorm:"default:false"`
-	Encrypted bool   `json:"-" gorm:"default:false"`
-	Client    string `gorm:"index"`
+	Public  bool   `json:"public" gorm:"default:false"`
+	USN     int    `json:"-" gorm:"index"`
+	Deleted bool   `json:"-" gorm:"default:false"`
+	Client  string `gorm:"index"`
 }
 
 func (SqliteNote) TableName() string {

test_models.go

@@ -23,11 +23,11 @@ type PgBook struct {
 	UserID    int      `json:"user_id" gorm:"index"`
 	Label     string   `json:"label" gorm:"index"`
 	Notes     []PgNote `json:"notes" gorm:"foreignKey:BookUUID;references:UUID"`
-	AddedOn   int64    `json:"added_on"`
-	EditedOn  int64    `json:"edited_on"`
-	USN       int      `json:"-" gorm:"index"`
-	Deleted   bool     `json:"-" gorm:"default:false"`
-	Encrypted bool     `json:"-" gorm:"default:false"`
+	AddedOn   int64 `json:"added_on"`
+	EditedOn  int64 `json:"edited_on"`
+	USN       int   `json:"-" gorm:"index"`
+	Deleted   bool  `json:"-" gorm:"default:false"`
+	Encrypted bool  `json:"-" gorm:"default:false"`
 }
 
 func (PgBook) TableName() string {