From 5cefece2644afffc313583512b79d25486947d6f Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Sat, 2 May 2020 18:00:26 +1000
Subject: [PATCH] switch primary key to deck id

---
 rslib/src/storage/deck/add_deck.sql           |  1 -
 rslib/src/storage/deck/get_deck.sql           |  2 +-
 rslib/src/storage/deck/mod.rs                 | 19 +++++--------------
 rslib/src/storage/deck/update_deck.sql        |  2 +-
 .../src/storage/upgrades/schema15_upgrade.sql |  6 +++---
 5 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 rslib/src/storage/deck/add_deck.sql

diff --git a/rslib/src/storage/deck/add_deck.sql b/rslib/src/storage/deck/add_deck.sql
deleted file mode 100644
index fbee07b1f..000000000
--- a/rslib/src/storage/deck/add_deck.sql
+++ /dev/null
@@ -1 +0,0 @@
-insert into decks 
\ No newline at end of file
diff --git a/rslib/src/storage/deck/get_deck.sql b/rslib/src/storage/deck/get_deck.sql
index 51ec1c145..b456367b5 100644
--- a/rslib/src/storage/deck/get_deck.sql
+++ b/rslib/src/storage/deck/get_deck.sql
@@ -1,6 +1,6 @@
 select
-  name,
   id,
+  name,
   mtime_secs,
   usn,
   common,
diff --git a/rslib/src/storage/deck/mod.rs b/rslib/src/storage/deck/mod.rs
index 89cbbc011..c8d28c13e 100644
--- a/rslib/src/storage/deck/mod.rs
+++ b/rslib/src/storage/deck/mod.rs
@@ -17,10 +17,10 @@ use unicase::UniCase;
 fn row_to_deck(row: &Row) -> Result<Deck> {
     let common = DeckCommon::decode(row.get_raw(4).as_blob()?)?;
     let kind = DeckKindProto::decode(row.get_raw(5).as_blob()?)?;
-    let id = row.get(1)?;
+    let id = row.get(0)?;
     Ok(Deck {
         id,
-        name: row.get(0)?,
+        name: row.get(1)?,
         mtime_secs: row.get(2)?,
         usn: row.get(3)?,
         common,
@@ -55,9 +55,9 @@ impl SqliteStorage {
     /// Get all deck names in human-readable form (::)
     pub(crate) fn get_all_deck_names(&self) -> Result<Vec<(DeckID, String)>> {
         self.db
-            .prepare("select name, id from decks")?
+            .prepare("select id, name from decks order by name")?
             .query_and_then(NO_PARAMS, |row| {
-                Ok((row.get(1)?, row.get_raw(0).as_str()?.replace('\x1f', "::")))
+                Ok((row.get(0)?, row.get_raw(1).as_str()?.replace('\x1f', "::")))
             })?
             .collect()
     }
@@ -97,8 +97,8 @@ impl SqliteStorage {
         let mut kind = vec![];
         kind_enum.encode(&mut kind)?;
         stmt.execute(params![
-            deck.name,
             deck.id,
+            deck.name,
             deck.mtime_secs,
             deck.usn,
             common,
@@ -136,15 +136,6 @@ impl SqliteStorage {
 
     // Upgrading/downgrading/legacy
 
-    // pub(crate) fn get_all_decks_as_schema11(&self) -> Result<HashMap<DeckID, DeckSchema11>> {
-    //     let mut nts = HashMap::new();
-    //     for (ntid, _name) in self.get_all_deck_names()? {
-    //         let full = self.get_deck(ntid)?.unwrap();
-    //         nts.insert(ntid, full.into());
-    //     }
-    //     Ok(nts)
-    // }
-
     pub(super) fn add_default_deck(&self, i18n: &I18n) -> Result<()> {
         let mut deck = Deck::new_normal();
         deck.id.0 = 1;
diff --git a/rslib/src/storage/deck/update_deck.sql b/rslib/src/storage/deck/update_deck.sql
index 5c77a89a2..d9e8a1d8c 100644
--- a/rslib/src/storage/deck/update_deck.sql
+++ b/rslib/src/storage/deck/update_deck.sql
@@ -1,4 +1,4 @@
 insert
-  or replace into decks (name, id, mtime_secs, usn, common, kind)
+  or replace into decks (id, name, mtime_secs, usn, common, kind)
 values
   (?, ?, ?, ?, ?, ?)
\ No newline at end of file
diff --git a/rslib/src/storage/upgrades/schema15_upgrade.sql b/rslib/src/storage/upgrades/schema15_upgrade.sql
index 084dd9be1..5c5e7fec1 100644
--- a/rslib/src/storage/upgrades/schema15_upgrade.sql
+++ b/rslib/src/storage/upgrades/schema15_upgrade.sql
@@ -27,14 +27,14 @@ create table notetypes (
 create unique index idx_notetypes_name on notetypes (name);
 create index idx_notetypes_usn on notetypes (usn);
 create table decks (
-  name text not null primary key collate unicase,
-  id integer not null,
+  id integer primary key not null,
+  name text not null collate unicase,
   mtime_secs integer not null,
   usn integer not null,
   common bytes not null,
   kind bytes not null
 );
-create unique index idx_decks_id on decks (id);
+create unique index idx_decks_name on decks (name);
 create index idx_cards_odid on cards (odid)
 where
   odid != 0;