GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 22:42:25 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

switch primary key to deck id

Browse source
This commit is contained in:
Damien Elmes 2020-05-02 18:00:26 +10:00
parent 8d17edc1e6
commit 5cefece264
5 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rslib/src/storage/deck/add_deck.sql
View file

@ -1 +0,0 @@
insert into decks

2
rslib/src/storage/deck/get_deck.sql
View file

@ -1,6 +1,6 @@
select select
name,
id, id,
name,
mtime_secs, mtime_secs,
usn, usn,
common, common,

19
rslib/src/storage/deck/mod.rs
View file

@ -17,10 +17,10 @@ use unicase::UniCase;
fn row_to_deck(row: &Row) -> Result<Deck> { fn row_to_deck(row: &Row) -> Result<Deck> {
let common = DeckCommon::decode(row.get_raw(4).as_blob()?)?; let common = DeckCommon::decode(row.get_raw(4).as_blob()?)?;
let kind = DeckKindProto::decode(row.get_raw(5).as_blob()?)?; let kind = DeckKindProto::decode(row.get_raw(5).as_blob()?)?;
let id = row.get(1)?; let id = row.get(0)?;
Ok(Deck { Ok(Deck {
id, id,
name: row.get(0)?, name: row.get(1)?,
mtime_secs: row.get(2)?, mtime_secs: row.get(2)?,
usn: row.get(3)?, usn: row.get(3)?,
common, common,
@ -55,9 +55,9 @@ impl SqliteStorage {
/// Get all deck names in human-readable form (::) /// Get all deck names in human-readable form (::)
pub(crate) fn get_all_deck_names(&self) -> Result<Vec<(DeckID, String)>> { pub(crate) fn get_all_deck_names(&self) -> Result<Vec<(DeckID, String)>> {
self.db self.db
.prepare("select name, id from decks")? .prepare("select id, name from decks order by name")?
.query_and_then(NO_PARAMS, |row| { .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() .collect()
} }
@ -97,8 +97,8 @@ impl SqliteStorage {
let mut kind = vec![]; let mut kind = vec![];
kind_enum.encode(&mut kind)?; kind_enum.encode(&mut kind)?;
stmt.execute(params![ stmt.execute(params![
deck.name,
deck.id, deck.id,
deck.name,
deck.mtime_secs, deck.mtime_secs,
deck.usn, deck.usn,
common, common,
@ -136,15 +136,6 @@ impl SqliteStorage {
// Upgrading/downgrading/legacy // 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<()> { pub(super) fn add_default_deck(&self, i18n: &I18n) -> Result<()> {
let mut deck = Deck::new_normal(); let mut deck = Deck::new_normal();
deck.id.0 = 1; deck.id.0 = 1;

2
rslib/src/storage/deck/update_deck.sql
View file

@ -1,4 +1,4 @@
insert insert
or replace into decks (name, id, mtime_secs, usn, common, kind) or replace into decks (id, name, mtime_secs, usn, common, kind)
values values
(?, ?, ?, ?, ?, ?) (?, ?, ?, ?, ?, ?)

6
rslib/src/storage/upgrades/schema15_upgrade.sql
View file

@ -27,14 +27,14 @@ create table notetypes (
create unique index idx_notetypes_name on notetypes (name); create unique index idx_notetypes_name on notetypes (name);
create index idx_notetypes_usn on notetypes (usn); create index idx_notetypes_usn on notetypes (usn);
create table decks ( create table decks (
name text not null primary key collate unicase, id integer primary key not null,
id integer not null, name text not null collate unicase,
mtime_secs integer not null, mtime_secs integer not null,
usn integer not null, usn integer not null,
common bytes not null, common bytes not null,
kind 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) create index idx_cards_odid on cards (odid)
where where
odid != 0; odid != 0;