Skip to content

fix(sqlite): correctly infer nullability for INTEGER PRIMARY KEY in RETURNING #4323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
at264939-ctrl wants to merge 16 commits into
base: main
Choose a base branch
from
Open

fix(sqlite): correctly infer nullability for INTEGER PRIMARY KEY in RETURNING #4323

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
dea4fce
fix(sqlite): handle nullability of INTEGER PRIMARY KEY in RETURNING
at264939-ctrl Jun 24, 2026
7e78dc7
chore: allow deprecated time types to fix CI
at264939-ctrl Jun 24, 2026
15865b0
refactor: address review comments (add regression test and update docs)
at264939-ctrl Jun 27, 2026
df39d72
test(sqlite): make regression test robust against CI interference
at264939-ctrl Jun 27, 2026
1b39bc2
chore: restore comment and remove redundant deprecation allow
at264939-ctrl Jun 27, 2026
bd76520
fix: update time crate formats to non-deprecated API (0.3.48+)
at264939-ctrl Jun 27, 2026
1c37c77
fix: update time crate formats to non-deprecated API (0.3.48+)
at264939-ctrl Jun 27, 2026
7a6a3ae
fix(sqlite): resolve INTEGER PRIMARY KEY nullability regression in RE…
at264939-ctrl Jun 27, 2026
4b22b6c
style: apply cargo fmt
at264939-ctrl Jun 27, 2026
6f8a8b4
fix(sqlite): use #[allow(deprecated)] for time format compatibility
at264939-ctrl Jun 27, 2026
54706f8
style: apply cargo fmt to time.rs
at264939-ctrl Jun 27, 2026
f670c00
test(sqlite): rename test table to packages per reviewer feedback
at264939-ctrl Jun 27, 2026
eaaa1fe
ci: retrigger
at264939-ctrl Jun 27, 2026
00ca3b6
chore: restore lost comment in macros.rs
at264939-ctrl Jun 27, 2026
64b83e5
test(sqlite): update sqlite.db with new regression test schemas
at264939-ctrl Jun 27, 2026
6d1f84b
fix(sqlite): restore Optional wrapper for time formats and regenerate…
at264939-ctrl Jun 27, 2026
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
View file
Open in desktop
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"))),
Comment thread
at264939-ctrl marked this conversation as resolved.
},
);
}
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
View file
Open in desktop
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)
Comment thread
at264939-ctrl marked this conversation as resolved.
} else {
Some(not_null == 0)
},
Expand Down
1 change: 1 addition & 0 deletions sqlx-sqlite/src/types/time.rs
View file
Open in desktop
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)]
Comment thread
at264939-ctrl marked this conversation as resolved.
mod formats {
use time::format_description::BorrowedFormatItem::{Component, Literal, Optional};
use time::format_description::{modifier, BorrowedFormatItem, Component::*};
Expand Down
Loading