aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-20 15:35:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

hide custom modules syntax behind --experimental-custom-modules flag

Browse Source
This commit is contained in:
Nikita Sivukhin
2025-10-27 12:29:05 +04:00
parent 67e62fd6ea
commit 299533b7b6
8 changed files with 121 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/python/src/lib.rs
View File

@@ -317,7 +317,7 @@ impl Drop for Connection {
#[allow(clippy::arc_with_non_send_sync)]
#[pyfunction(signature = (path))]
pub fn connect(path: &str) -> Result<Connection> {
match turso_core::Connection::from_uri(path, true, false, false, false, false) {
match turso_core::Connection::from_uri(path, true, false, false, false, false, false) {
Ok((io, conn)) => Ok(Connection { conn, _io: io }),
Err(e) => Err(PyErr::new::<ProgrammingError, _>(format!(
"Failed to create connection: {e:?}"

4
cli/app.rs
View File

@@ -78,6 +78,8 @@ pub struct Opts {
pub mcp: bool,
#[clap(long, help = "Enable experimental encryption feature")]
pub experimental_encryption: bool,
#[clap(long, help = "Enable experimental custom modules feature")]
pub experimental_custom_modules: bool,
}
const PROMPT: &str = "turso> ";
@@ -192,6 +194,7 @@ impl Limbo {
opts.experimental_views,
opts.experimental_strict,
opts.experimental_encryption,
opts.experimental_custom_modules,
)?
} else {
let flags = if opts.readonly {
@@ -209,6 +212,7 @@ impl Limbo {
.with_views(opts.experimental_views)
.with_strict(opts.experimental_strict)
.with_encryption(opts.experimental_encryption)
.with_custom_modules(opts.experimental_custom_modules)
.turso_cli(),
None,
)?;

2
cli/mcp_server.rs
View File

@@ -408,7 +408,7 @@ impl TursoMcpServer {
// Open the new database connection
let conn = if path == ":memory:" || path.contains([':', '?', '&', '#']) {
match Connection::from_uri(&path, true, false, false, false, false) {
match Connection::from_uri(&path, true, false, false, false, false, false) {
Ok((_io, c)) => c,
Err(e) => return format!("Failed to open database '{path}': {e}"),
}

1
core/incremental/cursor.rs
View File

@@ -316,6 +316,7 @@ mod tests {
enable_strict: false,
enable_load_extension: false,
enable_encryption: false,
enable_custom_modules: false,
},
None,
)?;

23
core/lib.rs
View File

@@ -113,6 +113,7 @@ pub struct DatabaseOpts {
pub enable_views: bool,
pub enable_strict: bool,
pub enable_encryption: bool,
pub enable_custom_modules: bool,
enable_load_extension: bool,
}
@@ -124,6 +125,7 @@ impl Default for DatabaseOpts {
enable_views: false,
enable_strict: false,
enable_encryption: false,
enable_custom_modules: false,
enable_load_extension: false,
}
}
@@ -164,6 +166,11 @@ impl DatabaseOpts {
self.enable_encryption = enable;
self
}
pub fn with_custom_modules(mut self, enable: bool) -> Self {
self.enable_custom_modules = enable;
self
}
}
#[derive(Clone, Debug, Default)]
@@ -870,6 +877,10 @@ impl Database {
self.opts.enable_views
}
pub fn experimental_custom_modules_enabled(&self) -> bool {
self.opts.enable_custom_modules
}
pub fn experimental_strict_enabled(&self) -> bool {
self.opts.enable_strict
}
@@ -1474,6 +1485,8 @@ impl Connection {
strict: bool,
// flag to opt-in encryption support
encryption: bool,
// flag to opt-in custom modules support
custom_modules: bool,
) -> Result<(Arc<dyn IO>, Arc<Connection>)> {
use crate::util::MEMORY_PATH;
let opts = OpenOptions::parse(uri)?;
@@ -1489,7 +1502,8 @@ impl Connection {
.with_indexes(use_indexes)
.with_views(views)
.with_strict(strict)
.with_encryption(encryption),
.with_encryption(encryption)
.with_custom_modules(custom_modules),
None,
)?;
let conn = db.connect()?;
@@ -1518,7 +1532,8 @@ impl Connection {
.with_indexes(use_indexes)
.with_views(views)
.with_strict(strict)
.with_encryption(encryption),
.with_encryption(encryption)
.with_custom_modules(custom_modules),
encryption_opts.clone(),
)?;
if let Some(modeof) = opts.modeof {
@@ -1997,6 +2012,10 @@ impl Connection {
self.db.experimental_views_enabled()
}
pub fn experimental_custom_modules_enabled(&self) -> bool {
self.db.experimental_custom_modules_enabled()
}
pub fn experimental_strict_enabled(&self) -> bool {
self.db.experimental_strict_enabled()
}

29
core/translate/index.rs
View File

@@ -29,15 +29,32 @@ use super::schema::{emit_schema_entry, SchemaEntryType, SQLITE_TABLEID};
#[allow(clippy::too_many_arguments)]
pub fn translate_create_index(
unique_if_not_exists: (bool, bool),
resolver: &Resolver,
idx_name: &Name,
tbl_name: &Name,
columns: &[SortedColumn],
mut program: ProgramBuilder,
connection: &Arc<crate::Connection>,
where_clause: Option<Box<Expr>>,
resolver: &Resolver,
stmt: ast::Stmt,
) -> crate::Result<ProgramBuilder> {
let sql = stmt.to_string();
let ast::Stmt::CreateIndex {
unique,
if_not_exists,
idx_name,
tbl_name,
columns,
where_clause,
with_clause,
using,
} = stmt
else {
panic!("translate_create_index must be called with CreateIndex AST node");
};
if !connection.experimental_custom_modules_enabled()
&& (using.is_some() || !with_clause.is_empty())
{
bail_parse_error!("custom modules is an experimental feature. Enable with --experimental-custom-modules flag")
}
let original_idx_name = idx_name;
let original_tbl_name = tbl_name;
let idx_name = normalize_ident(idx_name.as_str());

20
core/translate/mod.rs
View File

@@ -152,23 +152,9 @@ pub fn translate_inner(
}
ast::Stmt::Begin { typ, name } => translate_tx_begin(typ, name, resolver.schema, program)?,
ast::Stmt::Commit { name } => translate_tx_commit(name, program)?,
ast::Stmt::CreateIndex {
unique,
if_not_exists,
idx_name,
tbl_name,
columns,
where_clause,
} => translate_create_index(
(unique, if_not_exists),
resolver,
&idx_name.name,
&tbl_name,
&columns,
program,
connection,
where_clause,
)?,
ast::Stmt::CreateIndex { .. } => {
translate_create_index(program, connection, resolver, stmt)?
}
ast::Stmt::CreateTable {
temporary,
if_not_exists,

81
tests/integration/query_processing/encryption.rs
View File

@@ -46,8 +46,15 @@ fn test_per_page_encryption() -> anyhow::Result<()> {
"file:{}?cipher=aegis256&hexkey=b1bbfda4f589dc9daaf004fe21111e00dc00c98237102f5c7002a5669fc76327",
db_path.to_str().unwrap()
);
let (_io, conn) =
turso_core::Connection::from_uri(&uri, true, false, false, false, ENABLE_ENCRYPTION)?;
let (_io, conn) = turso_core::Connection::from_uri(
&uri,
true,
false,
false,
false,
ENABLE_ENCRYPTION,
false,
)?;
let mut row_count = 0;
run_query_on_row(&tmp_db, &conn, "SELECT * FROM test", |row: &Row| {
assert_eq!(row.get::<i64>(0).unwrap(), 1);
@@ -62,8 +69,15 @@ fn test_per_page_encryption() -> anyhow::Result<()> {
"file:{}?cipher=aegis256&hexkey=b1bbfda4f589dc9daaf004fe21111e00dc00c98237102f5c7002a5669fc76327",
db_path.to_str().unwrap()
);
let (_io, conn) =
turso_core::Connection::from_uri(&uri, true, false, false, false, ENABLE_ENCRYPTION)?;
let (_io, conn) = turso_core::Connection::from_uri(
&uri,
true,
false,
false,
false,
ENABLE_ENCRYPTION,
false,
)?;
run_query(
&tmp_db,
&conn,
@@ -77,8 +91,15 @@ fn test_per_page_encryption() -> anyhow::Result<()> {
"file:{}?cipher=aegis256&hexkey=b1bbfda4f589dc9daaf004fe21111e00dc00c98237102f5c7002a5669fc76327",
db_path.to_str().unwrap()
);
let (_io, conn) =
turso_core::Connection::from_uri(&uri, true, false, false, false, ENABLE_ENCRYPTION)?;
let (_io, conn) = turso_core::Connection::from_uri(
&uri,
true,
false,
false,
false,
ENABLE_ENCRYPTION,
false,
)?;
run_query(
&tmp_db,
&conn,
@@ -100,8 +121,15 @@ fn test_per_page_encryption() -> anyhow::Result<()> {
"file:{}?cipher=aegis256&hexkey=b1bbfda4f589dc9daaf004fe21111e00dc00c98237102f5c7002a5669fc76377",
db_path.to_str().unwrap()
);
let (_io, conn) =
turso_core::Connection::from_uri(&uri, true, false, false, false, ENABLE_ENCRYPTION)?;
let (_io, conn) = turso_core::Connection::from_uri(
&uri,
true,
false,
false,
false,
ENABLE_ENCRYPTION,
false,
)?;
let should_panic = panic::catch_unwind(panic::AssertUnwindSafe(|| {
run_query_on_row(&tmp_db, &conn, "SELECT * FROM test", |_row: &Row| {}).unwrap();
}));
@@ -114,8 +142,16 @@ fn test_per_page_encryption() -> anyhow::Result<()> {
//test connecting to encrypted db using insufficient encryption parameters in URI.This should panic.
let uri = format!("file:{}?cipher=aegis256", db_path.to_str().unwrap());
let should_panic = panic::catch_unwind(panic::AssertUnwindSafe(|| {
turso_core::Connection::from_uri(&uri, true, false, false, false, ENABLE_ENCRYPTION)
.unwrap();
turso_core::Connection::from_uri(
&uri,
true,
false,
false,
false,
ENABLE_ENCRYPTION,
false,
)
.unwrap();
}));
assert!(
should_panic.is_err(),
@@ -128,8 +164,16 @@ fn test_per_page_encryption() -> anyhow::Result<()> {
db_path.to_str().unwrap()
);
let should_panic = panic::catch_unwind(panic::AssertUnwindSafe(|| {
turso_core::Connection::from_uri(&uri, true, false, false, false, ENABLE_ENCRYPTION)
.unwrap();
turso_core::Connection::from_uri(
&uri,
true,
false,
false,
false,
ENABLE_ENCRYPTION,
false,
)
.unwrap();
}));
assert!(
should_panic.is_err(),
@@ -195,8 +239,15 @@ fn test_non_4k_page_size_encryption() -> anyhow::Result<()> {
"file:{}?cipher=aegis256&hexkey=b1bbfda4f589dc9daaf004fe21111e00dc00c98237102f5c7002a5669fc76327",
db_path.to_str().unwrap()
);
let (_io, conn) =
turso_core::Connection::from_uri(&uri, true, false, false, false, ENABLE_ENCRYPTION)?;
let (_io, conn) = turso_core::Connection::from_uri(
&uri,
true,
false,
false,
false,
ENABLE_ENCRYPTION,
false,
)?;
run_query_on_row(&tmp_db, &conn, "SELECT * FROM test", |row: &Row| {
assert_eq!(row.get::<i64>(0).unwrap(), 1);
assert_eq!(row.get::<String>(1).unwrap(), "Hello, World!");
@@ -261,6 +312,7 @@ fn test_corruption_turso_magic_bytes() -> anyhow::Result<()> {
false,
false,
ENABLE_ENCRYPTION,
false,
)
.unwrap();
run_query_on_row(&tmp_db, &conn, "SELECT * FROM test", |_row: &Row| {}).unwrap();
@@ -353,6 +405,7 @@ fn test_corruption_associated_data_bytes() -> anyhow::Result<()> {
false,
false,
ENABLE_ENCRYPTION,
false,
)
.unwrap();
run_query_on_row(&test_tmp_db, &conn, "SELECT * FROM test", |_row: &Row| {})