Merge remote-tracking branch 'origin/master'

deepkit · Jun 24, 2024 · 1e0d489 · 1e0d489
2 parents 2f32a12 + 81a1ab1
commit 1e0d489
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -73,6 +73,7 @@ jobs:
             packages/injector/ \
             packages/logger/ \
             packages/template/ \
+            packages/sql/ \
             packages/stopwatch/ \
             packages/workflow/ \
             packages/type/

diff --git a/packages/sql/tests/sql-query.spec.ts b/packages/sql/tests/sql-query.spec.ts
@@ -93,22 +93,21 @@ test('skip property', () => {
 
 test('QueryToSql', () => {
     class User {
-        id!: number;
+        id!: number & PrimaryKey;
         username!: string;
         password!: string;
         disabled!: boolean;
         created!: Date;
     }
 
-    const queryToSql = new SQLFilterBuilder(ReflectionClass.from(User), quoteId('user'), serializer, new SqlPlaceholderStrategy(), new class extends DefaultPlatform {
-        schemaParserType = MySchemaParser;
-        quoteIdentifier(id: string): string {
-            return quoteId(id);
+    const localAdapter: PreparedAdapter = {
+        ...adapter,
+        platform: new class extends MyPlatform {
+            quoteIdentifier = quoteId;
         }
-        quoteValue(value: any): string {
-            return escape(value);
-        }
-    });
+    };
+
+    const queryToSql = new SQLFilterBuilder(localAdapter, ReflectionClass.from(User), quoteId('user'), serializer, new SqlPlaceholderStrategy());
 
     expect(queryToSql.convert({ id: 123 })).toBe(`user.id = ?`);
     expect(queryToSql.convert({ id: '$id' })).toBe(`user.id = user.id`);