@triptease/sql-template-postgres 0.10.10 → 0.18.16

package/index.d.ts

@@ -1,2 +1,5 @@
-export * from "./api";
-export { PostgresClient } from "./PostgresClient";
+import { QueryConfig } from "pg";
+import { Template } from '@triptease/sql-template';
+export declare function debugQuery(sql: Template): string;
+export declare function postgresSql(sql: Template): string;
+export declare function query(template: Template): QueryConfig;

package/index.js

@@ -1,8 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PostgresClient = void 0;
-const tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./api"), exports);
-var PostgresClient_1 = require("./PostgresClient");
-Object.defineProperty(exports, "PostgresClient", { enumerable: true, get: function () { return PostgresClient_1.PostgresClient; } });
+exports.query = exports.postgresSql = exports.debugQuery = void 0;
+const pg_1 = require("pg");
+const sql_template_1 = require("@triptease/sql-template");
+const escapeIdentifier = pg_1.Client.prototype.escapeIdentifier;
+const escapeLiteral = pg_1.Client.prototype.escapeLiteral;
+function debugQuery(sql) {
+    return sql.expressions.flatMap(e => {
+        if (e instanceof sql_template_1.Text)
+            return [e.text];
+        if (e instanceof sql_template_1.Identifier)
+            return [escapeIdentifier(e.identifier)];
+        if (e instanceof sql_template_1.Value)
+            return [typeof e.value === 'string' ? escapeLiteral(e.value) : e.value];
+        return [];
+    }).join('');
+}
+exports.debugQuery = debugQuery;
+function postgresSql(sql) {
+    let count = 1;
+    return sql.expressions.flatMap(e => {
+        if (e instanceof sql_template_1.Text)
+            return [e.text];
+        if (e instanceof sql_template_1.Identifier)
+            return [escapeIdentifier(e.identifier)];
+        if (e instanceof sql_template_1.Value)
+            return '$' + count++;
+        return [];
+    }).join('');
+}
+exports.postgresSql = postgresSql;
+function query(template) {
+    return {
+        text: postgresSql(template),
+        values: template.expressions.flatMap(e => e instanceof sql_template_1.Value ? [e.value] : [])
+    };
+}
+exports.query = query;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triptease/sql-template-postgres",
-  "version": "0.10.10",
+  "version": "0.18.16",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/triptease/sql-template.git"
@@ -20,7 +20,7 @@
     "*.d.ts"
   ],
   "dependencies": {
-    "@triptease/sql-template": "0.10.10",
+    "@triptease/sql-template": "0.18.16",
     "pg": "^8.7.1",
     "tslib": "^2.3.1"
   },

package/PostgresClient.d.ts

@@ -1,9 +0,0 @@
-import { SimpleObject, SqlClient, SqlTemplate } from "../../sql-template/src";
-import { PoolConfig } from "pg";
-export declare class PostgresClient implements SqlClient {
-    private logger;
-    private pool;
-    constructor(connectionDetails: PoolConfig, logger?: (sql: string) => void);
-    query(sqlFragment: SqlTemplate): Promise<SimpleObject[]>;
-    close(): Promise<void>;
-}

package/PostgresClient.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PostgresClient = void 0;
-const tslib_1 = require("tslib");
-const pg_1 = require("pg");
-const api_1 = require("./api");
-class PostgresClient {
-    constructor(connectionDetails, logger = (sql) => console.log('PostgresClient.query', sql)) {
-        this.logger = logger;
-        this.pool = new pg_1.Pool(connectionDetails);
-    }
-    query(sqlFragment) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-            const client = yield this.pool.connect();
-            try {
-                const sql = (0, api_1.postgresText)(sqlFragment);
-                this.logger(sql);
-                const { rows } = yield client.query(sql, [...sqlFragment.values]);
-                return rows;
-            }
-            finally {
-                client.release();
-            }
-        });
-    }
-    close() {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-            return this.pool.end();
-        });
-    }
-}
-exports.PostgresClient = PostgresClient;
-//# sourceMappingURL=PostgresClient.js.map

package/api.d.ts

@@ -1,5 +0,0 @@
-import { SqlTemplate } from "../../sql-template/src";
-export declare function postgresText(sql: SqlTemplate): string;
-export declare function postgresQuery(sql: SqlTemplate): string;
-export declare function id(identifier: string): SqlTemplate;
-export declare function ids(identifiers: string[]): SqlTemplate;

package/api.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ids = exports.id = exports.postgresQuery = exports.postgresText = void 0;
-const src_1 = require("../../sql-template/src");
-const pg_1 = require("pg");
-const CompositeTemplate_1 = require("../../sql-template/src/CompositeTemplate");
-const escapeIdentifier = pg_1.Client.prototype.escapeIdentifier;
-const escapeLiteral = pg_1.Client.prototype.escapeLiteral;
-function postgresText(sql) {
-    let count = 1;
-    return sql.text.replace(/\?/g, () => `\$${count++}`);
-}
-exports.postgresText = postgresText;
-// Debug only
-function postgresQuery(sql) {
-    const values = [...sql.values];
-    return sql.text.replace(/\?/g, () => {
-        const value = values.shift();
-        if (typeof value === 'string')
-            return escapeLiteral(value);
-        return value;
-    });
-}
-exports.postgresQuery = postgresQuery;
-function id(identifier) {
-    return (0, src_1.sqlTemplate)(escapeIdentifier(identifier), []);
-}
-exports.id = id;
-function ids(identifiers) {
-    return (0, CompositeTemplate_1.compose)(identifiers.map(id));
-}
-exports.ids = ids;
-//# sourceMappingURL=api.js.map