MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-04-16 09:08:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix d7a918d regression in SQLite required version

Browse Source 
The pragma_* table-valued-functions require SQLite 3.16.0 (2017-01-02).
This commit is contained in:
Scott Lamb 2019-07-11 14:00:09 -07:00
parent d7a918d397
commit d75157af56
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
db/compare.rs
View File

@ -87,8 +87,11 @@ fn get_tables(c: &rusqlite::Connection) -> Result<Vec<String>, rusqlite::Error>
/// Returns a vec of columns in the given table. /// Returns a vec of columns in the given table.
fn get_table_columns(c: &rusqlite::Connection, table: &str) fn get_table_columns(c: &rusqlite::Connection, table: &str)
-> Result<Vec<Column>, rusqlite::Error> { -> Result<Vec<Column>, rusqlite::Error> {
c.prepare_cached("select * from pragma_table_info(?)")? // Note that placeholders aren't allowed for these pragmas. Just assume sane table names
.query_map(params![table], |r| Ok(Column { // (no escaping). "select * from pragma_..." syntax would be nicer but requires SQLite
// 3.16.0 (2017-01-02). Ubuntu 16.04 Xenial (still used on Travis CI) has an older SQLite.
c.prepare(&format!("pragma table_info(\"{}\")", table))?
.query_map(params![], |r| Ok(Column {
cid: r.get(0)?, cid: r.get(0)?,
name: r.get(1)?, name: r.get(1)?,
type_: r.get(2)?, type_: r.get(2)?,
@ -101,8 +104,9 @@ fn get_table_columns(c: &rusqlite::Connection, table: &str)
/// Returns a vec of indices associated with the given table. /// Returns a vec of indices associated with the given table.
fn get_indices(c: &rusqlite::Connection, table: &str) -> Result<Vec<Index>, rusqlite::Error> { fn get_indices(c: &rusqlite::Connection, table: &str) -> Result<Vec<Index>, rusqlite::Error> {
c.prepare_cached("select * from pragma_index_list(?)")? // See note at get_tables_columns about placeholders.
.query_map(params![table], |r| Ok(Index { c.prepare(&format!("pragma index_list(\"{}\")", table))?
.query_map(params![], |r| Ok(Index {
seq: r.get(0)?, seq: r.get(0)?,
name: r.get(1)?, name: r.get(1)?,
unique: r.get(2)?, unique: r.get(2)?,
@ -115,8 +119,9 @@ fn get_indices(c: &rusqlite::Connection, table: &str) -> Result<Vec<Index>, rusq
/// Returns a vec of all the columns in the given index. /// Returns a vec of all the columns in the given index.
fn get_index_columns(c: &rusqlite::Connection, index: &str) fn get_index_columns(c: &rusqlite::Connection, index: &str)
-> Result<Vec<IndexColumn>, rusqlite::Error> { -> Result<Vec<IndexColumn>, rusqlite::Error> {
c.prepare_cached("select * from pragma_index_info(?)")? // See note at get_tables_columns about placeholders.
.query_map(params![index], |r| Ok(IndexColumn { c.prepare(&format!("pragma index_info(\"{}\")", index))?
.query_map(params![], |r| Ok(IndexColumn {
seqno: r.get(0)?, seqno: r.get(0)?,
cid: r.get(1)?, cid: r.get(1)?,
name: r.get(2)?, name: r.get(2)?,