Skip to content

Handle missing declared types and converter name brackets in sqlite3 #9443

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

Merged
youknowone merged 1 commit into from
Oct 29, 2026
Merged

Handle missing declared types and converter name brackets in sqlite3 #9443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 19 additions & 10 deletions crates/stdlib/src/_sqlite3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2529,22 +2529,31 @@ mod _sqlite3 {
if detect_types & PARSE_COLNAMES != 0 {
let col_name = st.column_name(i);
let col_name = ptr_to_str(col_name, vm)?;
let col_name = col_name
.chars()
.skip_while(|&x| x != '[')
.skip(1)
.take_while(|&x| x != ']')
.flat_map(|x| x.to_uppercase())
.collect::<Box<str>>();
if let Some(converter) = converters().get_item_opt(&*col_name, vm)? {
let mut start = None;
let type_name = col_name.char_indices().find_map(|(index, ch)| match ch {
'[' => {
start = Some(index + 1);
None
}
']' => start.map(|start| &col_name[start..index]),
_ => None,
});
if let Some(type_name) = type_name
&& let Some(converter) =
converters().get_item_opt(&type_name.to_uppercase(), vm)?
{
cast_map.push(Some(converter));
continue;
}
}
if detect_types & PARSE_DECLTYPES != 0 {
let decltype = st.column_decltype(i);
let decltype = ptr_to_str(decltype, vm)?;
if let Some(decltype) = decltype.split_terminator(&[' ', '(']).next() {
// Expressions and columns without a declared type return NULL.
if !decltype.is_null()
&& let Some(decltype) = ptr_to_str(decltype, vm)?
.split_terminator(&[' ', '('])
.next()
{
let decltype = decltype.to_uppercase();
if let Some(converter) = converters().get_item_opt(&decltype, vm)? {
cast_map.push(Some(converter));
Expand Down
19 changes: 19 additions & 0 deletions extra_tests/snippets/stdlib_sqlite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,3 +1042,22 @@ def __del__(self):


reinit_restores_factories_after_callback_cleanup()


# Expressions have no declared type; column-name converters still take priority.
sqlite.register_converter("METADATA", lambda value: value.decode().upper())
try:
con = sqlite.connect(
":memory:", detect_types=sqlite.PARSE_DECLTYPES | sqlite.PARSE_COLNAMES
)
try:
assert con.execute(
"SELECT 1, NULL, 'value' AS \"name [METADATA]\""
).fetchone() == (1, None, "VALUE")
assert con.execute(
"SELECT 'value' AS \"name [METADATA\", 'value' AS \"name [[METADATA]\""
).fetchone() == ("value", "VALUE")
finally:
con.close()
finally:
del sqlite.converters["METADATA"]
Loading