@sqb/postgres 4.0.1-beta.9 → 4.0.6

package/dist/PgAdapter.js

@@ -16,7 +16,7 @@ class PgAdapter {
         };
     }
     async connect(config) {
-        const cfg = Object.assign({}, config.driverOptions);
+        const cfg = { ...config.driverOptions };
         if (config.user)
             cfg.user = config.user;
         if (config.password)

package/dist/PgConnection.d.ts

@@ -9,6 +9,10 @@ export declare class PgConnection implements Adapter.Connection {
     startTransaction(): Promise<void>;
     commit(): Promise<void>;
     rollback(): Promise<void>;
+    setSavepoint(savepoint: string): Promise<void>;
+    releaseSavepoint(savepoint: string): Promise<void>;
+    rollbackSavepoint(savepoint: string): Promise<void>;
+    getInTransaction(): boolean;
     test(): Promise<void>;
     getSchema(): Promise<string>;
     setSchema(schema: string): Promise<void>;

package/dist/PgConnection.js

@@ -1,12 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PgConnection = void 0;
-const assert_1 = __importDefault(require("assert"));
 const connect_1 = require("@sqb/connect");
 const postgresql_client_1 = require("postgresql-client");
+const datatype_map_1 = require("./datatype-map");
 const SqbDataTypToOIDMap = {
     [connect_1.DataType.BOOL]: postgresql_client_1.DataTypeOIDs.bool,
     [connect_1.DataType.CHAR]: postgresql_client_1.DataTypeOIDs.char,
@@ -42,11 +39,13 @@ class PgConnection {
         return this.rollback();
     }
     async startTransaction() {
-        assert_1.default.ok(this.intlcon, 'Can not start transaction for a closed db session');
+        if (!this.intlcon)
+            throw new Error('Can not start transaction for a closed db session');
         await this.intlcon.startTransaction();
     }
     async commit() {
-        assert_1.default.ok(this.intlcon, 'Can not commit transaction for a closed db session');
+        if (!this.intlcon)
+            throw new Error('Can not commit transaction for a closed db session');
         await this.intlcon.commit();
     }
     async rollback() {
@@ -54,19 +53,40 @@ class PgConnection {
             return;
         await this.intlcon.rollback();
     }
+    async setSavepoint(savepoint) {
+        if (!this.intlcon)
+            throw new Error('Can not set savepoint for a closed db session');
+        return this.intlcon.savepoint(savepoint);
+    }
+    async releaseSavepoint(savepoint) {
+        if (!this.intlcon)
+            throw new Error('Can not release savepoint for a closed db session');
+        return this.intlcon.releaseSavepoint(savepoint);
+    }
+    async rollbackSavepoint(savepoint) {
+        if (!this.intlcon)
+            throw new Error('Can not rollback to a savepoint for a closed db session');
+        return this.intlcon.rollbackToSavepoint(savepoint);
+    }
+    getInTransaction() {
+        return !!(this.intlcon && this.intlcon.inTransaction);
+    }
     async test() {
-        assert_1.default.ok(this.intlcon, 'DB session is closed');
+        if (!this.intlcon)
+            throw new Error('DB session is closed');
         await this.intlcon.query('select 1');
     }
     async getSchema() {
-        assert_1.default.ok(this.intlcon, 'DB session is closed');
+        if (!this.intlcon)
+            throw new Error('DB session is closed');
         const r = await this.intlcon.query('SHOW search_path');
         if (r && r.rows && r.rows[0])
             return r.rows[0][0];
         return '';
     }
     async setSchema(schema) {
-        assert_1.default.ok(this.intlcon, 'Can not set schema of a closed db session');
+        if (!this.intlcon)
+            throw new Error('Can not set schema of a closed db session');
         await this.intlcon.execute('SET search_path TO ' + schema);
     }
     onGenerateQuery(request) {
@@ -76,10 +96,20 @@ class PgConnection {
         }
     }
     async execute(query) {
-        assert_1.default.ok(this.intlcon, 'Can not execute query with a closed db session');
+        if (!this.intlcon)
+            throw new Error('Can not execute query with a closed db session');
+        const params = query.params?.map((v, i) => {
+            const paramOpts = Array.isArray(query.paramOptions) ? query.paramOptions[i] : undefined;
+            if (v != null && paramOpts && paramOpts.dataType) {
+                const oid = (0, datatype_map_1.dataTypeToOID)(paramOpts.dataType, paramOpts.isArray);
+                if (oid)
+                    return new postgresql_client_1.BindParam(oid, v);
+            }
+            return v;
+        });
         const opts = {
             autoCommit: query.autoCommit,
-            params: query.params,
+            params,
             cursor: query.cursor,
             fetchCount: query.fetchRows,
             objectRows: query.objectRows

package/dist/datatype-map.d.ts

@@ -0,0 +1,3 @@
+import { DataType } from '@sqb/builder';
+import { OID } from 'postgresql-client';
+export declare function dataTypeToOID(dataType: DataType, isArray?: boolean): OID | undefined;

package/dist/datatype-map.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dataTypeToOID = void 0;
+const builder_1 = require("@sqb/builder");
+const postgresql_client_1 = require("postgresql-client");
+function dataTypeToOID(dataType, isArray) {
+    if (dataType === builder_1.DataType.DATE)
+        return isArray ? postgresql_client_1.DataTypeOIDs._date : postgresql_client_1.DataTypeOIDs.date;
+    if (dataType === builder_1.DataType.BOOL)
+        return isArray ? postgresql_client_1.DataTypeOIDs._bool : postgresql_client_1.DataTypeOIDs.bool;
+    if (dataType === builder_1.DataType.CHAR)
+        return isArray ? postgresql_client_1.DataTypeOIDs._bpchar : postgresql_client_1.DataTypeOIDs.bpchar;
+    if (dataType === builder_1.DataType.SMALLINT)
+        return isArray ? postgresql_client_1.DataTypeOIDs._int2 : postgresql_client_1.DataTypeOIDs.int2;
+    if (dataType === builder_1.DataType.INTEGER)
+        return isArray ? postgresql_client_1.DataTypeOIDs._int4 : postgresql_client_1.DataTypeOIDs.int4;
+    if (dataType === builder_1.DataType.BIGINT)
+        return isArray ? postgresql_client_1.DataTypeOIDs._int8 : postgresql_client_1.DataTypeOIDs.int8;
+    if (dataType === builder_1.DataType.BINARY)
+        return isArray ? postgresql_client_1.DataTypeOIDs._bytea : postgresql_client_1.DataTypeOIDs.bytea;
+    if (dataType === builder_1.DataType.FLOAT)
+        return isArray ? postgresql_client_1.DataTypeOIDs._float4 : postgresql_client_1.DataTypeOIDs.float4;
+    if (dataType === builder_1.DataType.DOUBLE)
+        return isArray ? postgresql_client_1.DataTypeOIDs._float8 : postgresql_client_1.DataTypeOIDs.float8;
+    if (dataType === builder_1.DataType.GUID)
+        return isArray ? postgresql_client_1.DataTypeOIDs._uuid : postgresql_client_1.DataTypeOIDs.uuid;
+    if (dataType === builder_1.DataType.TEXT)
+        return isArray ? postgresql_client_1.DataTypeOIDs._text : postgresql_client_1.DataTypeOIDs.text;
+    if (dataType === builder_1.DataType.JSON)
+        return isArray ? postgresql_client_1.DataTypeOIDs._json : postgresql_client_1.DataTypeOIDs.json;
+}
+exports.dataTypeToOID = dataTypeToOID;

package/dist/index.js

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const connect_1 = require("@sqb/connect");
 const PgAdapter_1 = require("./PgAdapter");
 require("@sqb/postgres-dialect");
-connect_1.registerAdapter(new PgAdapter_1.PgAdapter());
+(0, connect_1.registerAdapter)(new PgAdapter_1.PgAdapter());

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/postgres",
   "description": "SQB serialization extension for PostgreSQL database",
-  "version": "4.0.1-beta.9",
+  "version": "4.0.6",
   "author": "Panates Ltd.",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
@@ -24,19 +24,19 @@
     "database"
   ],
   "dependencies": {
-    "putil-promisify": "^1.8.2"
+    "putil-promisify": "^1.8.5"
   },
   "devDependencies": {
-    "postgresql-client": "^1.13.2"
+    "postgresql-client": "^1.21.0"
   },
   "peerDependencies": {
-    "postgresql-client": "^1.13.0",
-    "@sqb/postgres-dialect": "^4.0.1-beta.9"
+    "postgresql-client": "^1.21.0",
+    "@sqb/postgres-dialect": "^4.0.6"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": ">= 10.0"
+    "node": ">= 14.0"
   },
   "directories": {
     "lib": "dist",
@@ -51,7 +51,7 @@
     "temp-dir": "./coverage/.nyc_output"
   },
   "scripts": {
-    "test": "ts-mocha -p test/tsconfig.json --paths --reporter spec test/**/*.spec.ts",
+    "test": "TS_NODE_PROJECT='./test/tsconfig.json' mocha -r ts-node/register -r tsconfig-paths/register --reporter spec test/**/*.spec.ts",
     "cover": "nyc --reporter=cobertura --reporter html --reporter text npm run test",
     "build": "tsc -b tsconfig-build.json",
     "compile": "tsc -b tsconfig.json",