Skip to content
Merged
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
25 changes: 25 additions & 0 deletions scripts/database-picker.test.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import assert from 'node:assert/strict';
import { test } from 'node:test';
import { build } from 'esbuild';

const { outputFiles } = await build({
entryPoints: ['src/utils/databasePicker.ts'],
bundle: true,
platform: 'node',
format: 'esm',
write: false,
});
const { filterDatabases, moveDatabaseSelection } = await import(
`data:text/javascript;base64,${Buffer.from(outputFiles[0].contents).toString('base64')}`
);

test('database search is case-insensitive and trims whitespace', () => {
assert.deepEqual(filterDatabases(['shop', 'Customer_Archive', 'customer_live'], ' CUSTOMER '),
['Customer_Archive', 'customer_live']);
});

test('database keyboard selection wraps and stays safe for empty results', () => {
assert.equal(moveDatabaseSelection(0, 3, -1), 2);
assert.equal(moveDatabaseSelection(2, 3, 1), 0);
assert.equal(moveDatabaseSelection(0, 0, 1), 0);
});
8 changes: 8 additions & 0 deletions scripts/window-close-permission.test.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import assert from 'node:assert/strict';
import { readFileSync } from 'node:fs';
import { test } from 'node:test';

test('main window can finish a close request after workspace recovery flushes', () => {
const capability = JSON.parse(readFileSync('src-tauri/capabilities/default.json', 'utf8'));
assert.ok(capability.permissions.includes('core:window:allow-destroy'));
});
1 change: 1 addition & 0 deletions src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"windows": ["main"],
"permissions": [
"core:default",
"core:window:allow-destroy",
"opener:default",
"dialog:default",
"dialog:allow-save",
Expand Down
38 changes: 34 additions & 4 deletions src-tauri/src/core/query_engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,19 +239,46 @@ fn build_explain_sql(sql: &str, database_type: &DatabaseType) -> Result<String>
Ok(format!("{prefix} {statement}"))
}

fn quote_database_name(name: &str, dialect: &str) -> Result<String> {
if name.trim().is_empty() || name.contains('\0') {
return Err(anyhow!(
"Database name cannot be empty or contain a NUL character"
));
}
match dialect {
"postgres" => Ok(format!("\"{}\"", name.replace('"', "\"\""))),
"mysql" => Ok(format!("`{}`", name.replace('`', "``"))),
_ => Err(anyhow!("Unsupported database type")),
}
}

#[cfg(test)]
mod tests {
use super::{
build_browse_order_clause, build_explain_sql, build_seek_predicate, build_where_clause,
group_foreign_keys, json_boolean_number, mysql_type_is_boolean, with_seek_predicate,
PendingExport, QueryEngine, TableExportWriter,
group_foreign_keys, json_boolean_number, mysql_type_is_boolean, quote_database_name,
with_seek_predicate, PendingExport, QueryEngine, TableExportWriter,
};
use crate::core::{
connection_manager::ConnectionManager, ConnectionConfig, DatabaseType, FilterConfig,
};
use serde_json::{json, Value};
use uuid::Uuid;

#[test]
fn database_creation_quotes_names_as_single_identifiers() {
assert_eq!(
quote_database_name("shop\"; DROP DATABASE prod; --", "postgres").unwrap(),
"\"shop\"\"; DROP DATABASE prod; --\""
);
assert_eq!(
quote_database_name("shop`; DROP DATABASE prod; --", "mysql").unwrap(),
"`shop``; DROP DATABASE prod; --`"
);
assert!(quote_database_name("", "postgres").is_err());
assert!(quote_database_name("bad\0name", "mysql").is_err());
}

#[test]
fn table_browse_uses_primary_key_as_stable_tie_breaker() {
let keys = vec!["id".to_string()];
Expand Down Expand Up @@ -2003,7 +2030,10 @@ impl QueryEngine {
{
let pools = manager.get_postgres_pools().await;
if let Some(pool) = pools.get(connection_id) {
let sql = format!("CREATE DATABASE \"{}\"", db_name);
let sql = format!(
"CREATE DATABASE {}",
quote_database_name(db_name, "postgres")?
);
sqlx::query(&sql).execute(pool).await?;
return Ok(());
}
Expand All @@ -2013,7 +2043,7 @@ impl QueryEngine {
{
let pools = manager.get_mysql_pools().await;
if let Some(pool) = pools.get(connection_id) {
let sql = format!("CREATE DATABASE `{}`", db_name);
let sql = format!("CREATE DATABASE {}", quote_database_name(db_name, "mysql")?);
sqlx::query(&sql).execute(pool).await?;
return Ok(());
}
Expand Down
Loading
Loading