aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2025-12-18 09:04:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'Fix panic on loading extension on brand new connection' from Preston Thorpe

Browse Source 
Closes #2476

Closes #2477
This commit is contained in:
Preston Thorpe
2025-08-06 23:44:38 -04:00
committed by GitHub
parent 0777fd9082 ae99edf4a6
commit f55d34a3db
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/ext/dynamic.rs
View File

@@ -58,7 +58,7 @@ impl Connection {
LimboError::ExtensionError("Error locking extension libraries".to_string()) LimboError::ExtensionError("Error locking extension libraries".to_string())
})? })?
.push((Arc::new(lib), api_ref)); .push((Arc::new(lib), api_ref));
{ if self.is_db_initialized() {
self.parse_schema_rows()?; self.parse_schema_rows()?;
} }
Ok(()) Ok(())

24
testing/cli_tests/extensions.py
View File

@@ -335,7 +335,7 @@ def _test_series(limbo: TestTursoShell):
limbo.run_test_fn( limbo.run_test_fn(
"SELECT * FROM generate_series WHERE 1 = start AND 10 = stop;", "SELECT * FROM generate_series WHERE 1 = start AND 10 = stop;",
lambda res: res == "1\n2\n3\n4\n5\n6\n7\n8\n9\n10", lambda res: res == "1\n2\n3\n4\n5\n6\n7\n8\n9\n10",
"Constraint with column on RHS used as TVF arg" "Constraint with column on RHS used as TVF arg",
) )
limbo.run_test_fn( limbo.run_test_fn(
"SELECT * FROM generate_series WHERE stop = 10 AND start = 1;", "SELECT * FROM generate_series WHERE stop = 10 AND start = 1;",
@@ -396,22 +396,22 @@ def _test_series(limbo: TestTursoShell):
limbo.run_test_fn( limbo.run_test_fn(
"SELECT t.id, series.value FROM target t, generate_series(t.id, 3) series;", "SELECT t.id, series.value FROM target t, generate_series(t.id, 3) series;",
lambda res: res == "1|1\n1|2\n1|3\n2|2\n2|3\n3|3", lambda res: res == "1|1\n1|2\n1|3\n2|2\n2|3\n3|3",
"Column reference from table on the left used as generate_series argument" "Column reference from table on the left used as generate_series argument",
) )
limbo.run_test_fn( limbo.run_test_fn(
"SELECT t.id, series.value FROM generate_series(t.id, 3) series, target t;", "SELECT t.id, series.value FROM generate_series(t.id, 3) series, target t;",
lambda res: res == "1|1\n1|2\n1|3\n2|2\n2|3\n3|3", lambda res: res == "1|1\n1|2\n1|3\n2|2\n2|3\n3|3",
"Column reference from table on the right used as generate_series argument" "Column reference from table on the right used as generate_series argument",
) )
limbo.run_test_fn( limbo.run_test_fn(
"SELECT one.value, series.value FROM (SELECT 1 AS value) one, generate_series(one.value, 3) series;", "SELECT one.value, series.value FROM (SELECT 1 AS value) one, generate_series(one.value, 3) series;",
lambda res: res == "1|1\n1|2\n1|3", lambda res: res == "1|1\n1|2\n1|3",
"Column reference from scalar subquery (left side)" "Column reference from scalar subquery (left side)",
) )
limbo.run_test_fn( limbo.run_test_fn(
"SELECT one.value, series.value FROM generate_series(one.value, 3) series, (SELECT 1 AS value) one;", "SELECT one.value, series.value FROM generate_series(one.value, 3) series, (SELECT 1 AS value) one;",
lambda res: res == "1|1\n1|2\n1|3", lambda res: res == "1|1\n1|2\n1|3",
"Column reference from scalar subquery (right side)" "Column reference from scalar subquery (right side)",
) )
limbo.run_test_fn( limbo.run_test_fn(
"SELECT " "SELECT "
@@ -421,27 +421,27 @@ def _test_series(limbo: TestTursoShell):
"NATURAL JOIN " "NATURAL JOIN "
" (SELECT 1 AS start, 3 AS stop, 2 AS value) a;", " (SELECT 1 AS start, 3 AS stop, 2 AS value) a;",
lambda res: res == "2|1|3", lambda res: res == "2|1|3",
"Natural join where TVF arguments come from column references" "Natural join where TVF arguments come from column references",
) )
limbo.run_test_fn( limbo.run_test_fn(
"SELECT * FROM generate_series(a.start, a.stop) JOIN (SELECT 1 AS start, 3 AS stop) a USING (start, stop);", "SELECT * FROM generate_series(a.start, a.stop) JOIN (SELECT 1 AS start, 3 AS stop) a USING (start, stop);",
lambda res: res == "1\n2\n3", lambda res: res == "1\n2\n3",
"Join USING where TVF arguments come from column references" "Join USING where TVF arguments come from column references",
) )
limbo.run_test_fn( limbo.run_test_fn(
"SELECT a.value, b.value FROM generate_series(b.value, b.value+1) a JOIN generate_series(1, 2) b;", "SELECT a.value, b.value FROM generate_series(b.value, b.value+1) a JOIN generate_series(1, 2) b;",
lambda res: res == "1|1\n2|1\n2|2\n3|2", lambda res: res == "1|1\n2|1\n2|2\n3|2",
"TVF arguments come from another TVF" "TVF arguments come from another TVF",
) )
limbo.run_test_fn( limbo.run_test_fn(
"SELECT * FROM generate_series(a.start, a.stop) b, generate_series(b.start, b.stop) a;", "SELECT * FROM generate_series(a.start, a.stop) b, generate_series(b.start, b.stop) a;",
lambda res: "No valid query plan found" in res or "no query solution" in res, lambda res: "No valid query plan found" in res or "no query solution" in res,
"circular column references between two generate_series" "circular column references between two generate_series",
) )
limbo.run_test_fn( limbo.run_test_fn(
"SELECT * FROM generate_series(b.start, b.stop) b;", "SELECT * FROM generate_series(b.start, b.stop) b;",
lambda res: "Invalid Argument" in res or 'first argument to "generate_series()" missing or unusable' in res, lambda res: "Invalid Argument" in res or 'first argument to "generate_series()" missing or unusable' in res,
"self-reference in generate_series arguments" "self-reference in generate_series arguments",
) )
limbo.quit() limbo.quit()
@@ -738,7 +738,9 @@ def test_create_virtual_table():
def test_csv(): def test_csv():
limbo = TestTursoShell() # open new empty connection explicitly to test whether we can load an extension
# with brand new connection/uninitialized database.
limbo = TestTursoShell(init_commands="")
ext_path = "./target/debug/liblimbo_csv" ext_path = "./target/debug/liblimbo_csv"
limbo.execute_dot(f".load {ext_path}") limbo.execute_dot(f".load {ext_path}")