@malloydata/db-postgres 0.0.79 → 0.0.80-dev230824170739

package/dist/postgres_connection.d.ts

@@ -13,6 +13,7 @@ interface PostgresConnectionConfiguration {
 }
 type PostgresConnectionConfigurationReader = PostgresConnectionConfiguration | (() => Promise<PostgresConnectionConfiguration>);
 export declare class PostgresConnection implements Connection, StreamingConnection, PersistSQLResults {
+    private readonly dialect;
     private isSetup;
     private schemaCache;
     private sqlSchemaCache;

package/dist/postgres_connection.js

@@ -55,38 +55,15 @@ exports.PooledPostgresConnection = exports.PostgresConnection = void 0;
 //     create extension if not exists tsm_system_rows
 //
 const crypto = __importStar(require("crypto"));
+const malloy_1 = require("@malloydata/malloy");
 const pg_1 = require("pg");
 const pg_query_stream_1 = __importDefault(require("pg-query-stream"));
 const crypto_1 = require("crypto");
-const postgresToMalloyTypes = {
-    'character varying': 'string',
-    'name': 'string',
-    'text': 'string',
-    'date': 'date',
-    'integer': 'number',
-    'bigint': 'number',
-    'double precision': 'number',
-    'timestamp without time zone': 'timestamp',
-    'oid': 'string',
-    'boolean': 'boolean',
-    // ARRAY: "string",
-    'timestamp': 'timestamp',
-    '"char"': 'string',
-    'character': 'string',
-    'smallint': 'number',
-    'xid': 'string',
-    'real': 'number',
-    'interval': 'string',
-    'inet': 'string',
-    'regtype': 'string',
-    'numeric': 'number',
-    'bytea': 'string',
-    'pg_ndistinct': 'number',
-};
 const DEFAULT_PAGE_SIZE = 1000;
 const SCHEMA_PAGE_SIZE = 1000;
 class PostgresConnection {
     constructor(name, queryConfigReader = {}, configReader = {}) {
+        this.dialect = new malloy_1.PostgresDialect();
         this.isSetup = false;
         this.schemaCache = new Map();
         this.sqlSchemaCache = new Map();
@@ -232,10 +209,10 @@ class PostgresConnection {
         for (const row of result.rows) {
             const postgresDataType = row['data_type'];
             let s = structDef;
-            let malloyType = postgresToMalloyTypes[postgresDataType];
+            let malloyType = this.dialect.sqlTypeToMalloyType(postgresDataType);
             let name = row['column_name'];
             if (postgresDataType === 'ARRAY') {
-                malloyType = postgresToMalloyTypes[row['element_type']];
+                malloyType = this.dialect.sqlTypeToMalloyType(row['element_type']);
                 s = {
                     type: 'struct',
                     name: row['column_name'],
@@ -252,7 +229,7 @@ class PostgresConnection {
                 name = 'value';
             }
             if (malloyType) {
-                s.fields.push({ type: malloyType, name });
+                s.fields.push({ ...malloyType, name });
             }
             else {
                 s.fields.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-postgres",
-  "version": "0.0.79",
+  "version": "0.0.80-dev230824170739",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,7 +19,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.79",
+    "@malloydata/malloy": "^0.0.80-dev230824170739",
     "@types/pg": "^8.6.1",
     "pg": "^8.7.1",
     "pg-query-stream": "4.2.3"