Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions sqlx-sqlite/src/connection/explain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -373,17 +373,17 @@ fn opcode_to_type(op: &str) -> DataType {
fn root_block_columns(
conn: &mut ConnectionState,
) -> Result<HashMap<(i64, i64), IntMap<ColumnType>>, Error> {
let table_block_columns: Vec<(i64, i64, i64, String, bool)> = execute::iter(
let table_block_columns: Vec<(i64, i64, i64, String, bool, i64)> = execute::iter(
conn,
"SELECT s.dbnum, s.rootpage, col.cid as colnum, col.type, col.\"notnull\"
"SELECT s.dbnum, s.rootpage, col.cid as colnum, col.type, col.\"notnull\", col.pk
FROM (
select 1 dbnum, tss.* from temp.sqlite_schema tss
UNION ALL select 0 dbnum, mss.* from main.sqlite_schema mss
) s
JOIN pragma_table_info(s.name) AS col
WHERE s.type = 'table'
UNION ALL
SELECT s.dbnum, s.rootpage, idx.seqno as colnum, col.type, col.\"notnull\"
SELECT s.dbnum, s.rootpage, idx.seqno as colnum, col.type, col.\"notnull\", col.pk
FROM (
select 1 dbnum, tss.* from temp.sqlite_schema tss
UNION ALL select 0 dbnum, mss.* from main.sqlite_schema mss
Expand All @@ -400,13 +400,13 @@ fn root_block_columns(
.collect::<Result<Vec<_>, Error>>()?;

let mut row_info: HashMap<(i64, i64), IntMap<ColumnType>> = HashMap::new();
for (dbnum, block, colnum, datatype, notnull) in table_block_columns {
for (dbnum, block, colnum, datatype, notnull, pk) in table_block_columns {
let row_info = row_info.entry((dbnum, block)).or_default();
row_info.insert(
colnum,
ColumnType::Single {
datatype: datatype.parse().unwrap_or(DataType::Null),
nullable: Some(!notnull),
nullable: Some(!(notnull || (pk > 0 && datatype.to_lowercase() == "integer"))),
},
);
}
Expand Down Expand Up @@ -1640,7 +1640,7 @@ fn test_root_block_columns_has_types() {
assert_eq!(
Some(&ColumnType::Single {
datatype: DataType::Integer,
nullable: Some(true) //sqlite primary key columns are nullable unless declared not null
nullable: Some(false)
}),
root_block_cols[&table_db_block].get(&0)
);
Expand All @@ -1665,7 +1665,7 @@ fn test_root_block_columns_has_types() {
assert_eq!(
Some(&ColumnType::Single {
datatype: DataType::Integer,
nullable: Some(true) //sqlite primary key columns are nullable unless declared not null
nullable: Some(false)
}),
root_block_cols[&table_db_block].get(&0)
);
Expand All @@ -1683,7 +1683,7 @@ fn test_root_block_columns_has_types() {
assert_eq!(
Some(&ColumnType::Single {
datatype: DataType::Integer,
nullable: Some(true) //sqlite primary key columns are nullable unless declared not null
nullable: Some(false)
}),
root_block_cols[&table_db_block].get(&0)
);
Expand Down
2 changes: 1 addition & 1 deletion sqlx-sqlite/src/statement/handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ impl StatementHandle {
.to_bytes()
.eq_ignore_ascii_case("integer".as_bytes())
{
None
Some(false)
} else {
Some(not_null == 0)
},
Expand Down
1 change: 1 addition & 0 deletions sqlx-sqlite/src/types/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ fn decode_datetime_from_text(value: &str) -> Option<PrimitiveDateTime> {
None
}

#[allow(deprecated)]
mod formats {
use time::format_description::BorrowedFormatItem::{Component, Literal, Optional};
use time::format_description::{modifier, BorrowedFormatItem, Component::*};
Expand Down
Loading