Skip to content

Commit 4304a1e

Browse files
authored
Fix undefined query order in a test (#308)
The underlying ORDER BY data was identical which meant either order was correct. Also, add in a run mode for encrypted DBs (use `bun run vite --force --mode encrypted`)
1 parent 34524ac commit 4304a1e

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

servers/javascript/.env.encrypted

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
VITE_ENCRYPTED_DBS=true

servers/javascript/src/tdk.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,11 @@ export class TDKImpl implements tdk.TDK, AsyncDisposable {
396396
}
397397
this.#logger.info `Reset: Creating database ${name} with ${collections?.length ?? 0} collection(s)`;
398398
const db = await cbl.Database.open({name: name, version: 1, collections: colls});
399+
if (import.meta.env.VITE_ENCRYPTED_DBS === 'true') {
400+
this.#logger.info `- VITE_ENCRYPTED_DBS set, adding encryption to ${name}`;
401+
await db.changeEncryptionKey("password");
402+
}
403+
399404
this.#databases.set(name, db);
400405
return db;
401406
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
interface ViteTypeOptions {
2+
strictImportMetaEnv: unknown
3+
}
4+
5+
interface ImportMetaEnv {
6+
readonly VITE_ENCRYPTED_DBS?: string;
7+
}
8+
9+
interface ImportMeta {
10+
readonly env: ImportMetaEnv;
11+
}

tests/dev_e2e/test_query_consistency.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ async def test_query_inner_join(self, cblpytest: CBLPyTest):
294294
ON airports.icao = routes.destinationairport
295295
WHERE airports.country = "United States"
296296
AND routes.stops = 0
297-
ORDER BY routes.destinationairport
297+
ORDER BY routes.sourceairport
298298
"""
299299

300300
await self._test_join(cblpytest, query)

0 commit comments

Comments
 (0)