feature(sql): remove pg-native to make deployment easier

deepkit · Oct 5, 2023 · 1495723 · 1495723
1 parent 852da12
commit 1495723
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 22 deletions.
diff --git a/packages/postgres/package-lock.json b/packages/postgres/package-lock.json
diff --git a/packages/postgres/package.json b/packages/postgres/package.json
@@ -33,7 +33,6 @@
   "dependencies": {
     "@types/pg": "^7.14.7",
     "pg": "^8.5.1",
-    "pg-native": "^3.0.0",
     "sqlstring": "^2.3.2"
   },
   "devDependencies": {

diff --git a/packages/sql/src/platform/default-platform.ts b/packages/sql/src/platform/default-platform.ts
@@ -134,6 +134,9 @@ export abstract class DefaultPlatform {
         }, sqlType, size, scale);
     }
 
+    /**
+     * Last matching check wins.
+     */
     addType(kind: ReflectionKind | TypeMappingChecker, sqlType: string, size?: number, scale?: number, unsigned?: boolean) {
         this.typeMapping.set(kind, { sqlType, size, scale, unsigned });
     }

diff --git a/packages/sql/src/serializer/sql-serializer.ts b/packages/sql/src/serializer/sql-serializer.ts
@@ -97,7 +97,6 @@ function deserializeSqlArray(type: TypeArray, state: TemplateState) {
  */
 function serializeSqlObjectLiteral(type: TypeClass | TypeObjectLiteral, state: TemplateState) {
     if (undefined !== referenceAnnotation.getFirst(type)) return;
-
     if (!isDirectPropertyOfEntity(type)) return;
 
     //TypeClass|TypeObjectLiteral properties are serialized as JSON

diff --git a/packages/sql/src/sql-adapter.ts b/packages/sql/src/sql-adapter.ts
@@ -25,7 +25,8 @@ import {
     FilterQuery,
     FindQuery,
     GenericQueryResolver,
-    ItemNotFound, MigrateOptions,
+    ItemNotFound,
+    MigrateOptions,
     OrmEntity,
     PatchResult,
     Query,
@@ -45,6 +46,7 @@ import {
     ReceiveType,
     ReflectionClass,
     ReflectionKind,
+    ReflectionProperty,
     resolveReceiveType,
     Type
 } from '@deepkit/type';
@@ -822,7 +824,7 @@ export class SQLPersistence extends DatabasePersistence {
 
                 const v = converted[property.name];
                 params.push(v === undefined ? null : v);
-                row.push(this.getPlaceholderSymbol());
+                row.push(this.getPlaceholderSymbol(property));
             }
 
             insert.push(row.join(', '));
@@ -842,7 +844,7 @@ export class SQLPersistence extends DatabasePersistence {
     protected resetPlaceholderSymbol() {
     }
 
-    protected getPlaceholderSymbol() {
+    protected getPlaceholderSymbol(property: ReflectionProperty) {
         return '?';
     }
 
@@ -854,12 +856,13 @@ export class SQLPersistence extends DatabasePersistence {
     async remove<T extends OrmEntity>(classSchema: ReflectionClass<T>, items: T[]): Promise<void> {
         const scopeSerializer = getSerializeFunction(classSchema.type, this.platform.serializer.serializeRegistry);
         const pks: any[] = [];
-        const pkName = classSchema.getPrimary().name;
+        const primary = classSchema.getPrimary();
+        const pkName = primary.name;
         const params: any[] = [];
 
         for (const item of items) {
             const converted = scopeSerializer(item);
-            pks.push(this.getPlaceholderSymbol());
+            pks.push(this.getPlaceholderSymbol(primary));
             params.push(converted[pkName]);
         }