af-db-ts 2.0.19 → 2.0.73

package/dist/cjs/src/pg/prepare-value.js

@@ -1,85 +1,132 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareSqlValuePg = exports.prepareSqlStringPg = void 0;
-// noinspection SqlResolve
-const luxon_1 = require("luxon");
-const i_pg_1 = require("../@types/i-pg");
-const NULL = 'null';
-const utc$ = (millis) => luxon_1.DateTime.fromMillis(millis == null ? Date.now() : millis).setZone('UTC');
-const prepareSqlStringPg = (s) => {
-    s = String(s);
-    if (/['\\]|\${2,}/.test(s)) {
-        return `$s$${s}$s$`;
+exports.prepareSqlValuePg = exports.prepareSqlStringPg = exports.quoteStringPg = void 0;
+const af_tools_ts_1 = require("af-tools-ts");
+const common_1 = require("../common");
+const utils_dt_1 = require("../utils/utils-dt");
+const utils_num_1 = require("../utils/utils-num");
+const utils_1 = require("../utils/utils");
+const utils_array_1 = require("../utils/utils-array");
+const quoteStringPg = (value) => {
+    if (value == null) {
+        return common_1.NULL;
     }
-    return `'${s}'`;
+    return /['\\]|\${2,}/.test(value) ? `$s$${value}$s$` : `'${value}'`;
+};
+exports.quoteStringPg = quoteStringPg;
+const prepareSqlStringPg = (value, fieldDef) => {
+    if (value == null) {
+        return common_1.NULL;
+    }
+    let v = String(value);
+    const { length = 0, noQuotes } = fieldDef;
+    if (length > 0 && v.length > length) {
+        v = v.substring(0, length);
+    }
+    if (noQuotes) {
+        return v;
+    }
+    return (0, exports.quoteStringPg)(v);
 };
 exports.prepareSqlStringPg = prepareSqlStringPg;
+const prepareDateTimeOffset = (value, fieldDef) => (0, utils_dt_1.getDatetimeWithPrecisionAndOffset)({ value, fieldDef, defaultDtPrecision: 6 });
+const prepareTimeOffset = (value, fieldDefOriginal) => {
+    const fieldDef = { ...fieldDefOriginal, noQuotes: true };
+    fieldDef.dateTimeOptions = fieldDef.dateTimeOptions || {};
+    const { includeOffset = fieldDef.dataType === 'timetz' } = fieldDef.dateTimeOptions;
+    fieldDef.dateTimeOptions.includeOffset = includeOffset;
+    const dts = (0, utils_dt_1.getDatetimeWithPrecisionAndOffset)({ value, fieldDef, defaultDtPrecision: 6, stripTrailingZeros: true });
+    return dts === common_1.NULL ? common_1.NULL : `'${dts.substring(11, dts.length)}'::${fieldDef.dataType}`;
+};
+const prepareJsonPg = (value, dataType) => {
+    const v = (0, utils_1.prepareJSON)(value);
+    if (v === common_1.NULL) {
+        return common_1.NULL;
+    }
+    return `${(0, exports.quoteStringPg)(v)}::${dataType}`;
+};
 const prepareSqlValuePg = (arg) => {
     const { value, fieldDef } = arg;
-    if (value == null && fieldDef.isNullable) {
-        return NULL;
+    if (value == null) {
+        return common_1.NULL;
     }
-    switch (fieldDef.dataType) {
-        case i_pg_1.EDataTypePg.boolean: {
-            return value ? 'true' : 'false';
-        }
-        case i_pg_1.EDataTypePg.bigint: {
-            return `'${value}'`;
+    const fieldDefWithNoQuotes = { ...fieldDef, noQuotes: true };
+    let v = value;
+    const { noQuotes, dataType } = fieldDef;
+    switch (dataType) {
+        case 'bit':
+            return (0, af_tools_ts_1.getBool)(value) ? '1' : '0';
+        case 'bool':
+        case 'boolean':
+            return (0, af_tools_ts_1.getBool)(value) ? 'true' : 'false';
+        case 'smallint':
+        case 'int2':
+            return (0, utils_num_1.prepareIntNumber)(value, -32768, 32767);
+        case 'int':
+        case 'integer':
+        case 'int4':
+            return (0, utils_num_1.prepareIntNumber)(value, -2147483648, 2147483647);
+        case 'bigint':
+        case 'int8':
+            return (0, utils_num_1.prepareBigIntNumber)(value);
+        case 'numeric':
+        case 'decimal':
+            return (0, utils_num_1.prepareNumeric)(value, fieldDef.precision, fieldDef.scale);
+        case 'real':
+        case 'float4':
+        case 'money':
+        case 'double precision':
+        case 'float8':
+            return (0, utils_num_1.prepareFloatNumber)(value);
+        case 'json':
+        case 'jsonb':
+            return prepareJsonPg(value, dataType);
+        case 'uuid':
+            return (0, utils_1.prepareUUID)(v, true, fieldDef.noQuotes);
+        case 'string':
+        case 'text':
+        case 'character':
+        case 'char':
+        case 'varchar':
+        case 'character varying':
+            return (0, exports.prepareSqlStringPg)(value, fieldDef);
+        case 'timestamp':
+        case 'timestamp without time zone': {
+            // '2023-09-05T02:23:54.105+03:00'::timestamp
+            // '2023-09-05T02:23:54.105'::timestamp
+            const { includeOffset = false } = fieldDef.dateTimeOptions || {}; // По умолчанию для timestamp includeOffset = false
+            const str = prepareDateTimeOffset(value, { ...fieldDef, noQuotes: true, dateTimeOptions: { ...(fieldDef.dateTimeOptions || {}), includeOffset } });
+            return str === common_1.NULL ? common_1.NULL : `'${str}'::timestamp`;
         }
-        case i_pg_1.EDataTypePg.numeric:
-        case i_pg_1.EDataTypePg.real: {
-            const v = Number(value);
-            return Number.isNaN(v) ? NULL : v;
+        case 'timestamptz':
+        case 'timestamp with time zone': {
+            // '2023-09-05T02:23:54.105'::timestamptz
+            // '2023-09-05T02:23:54.105+03:00'::timestamptz
+            const str = prepareDateTimeOffset(value, fieldDefWithNoQuotes);
+            return str === common_1.NULL ? common_1.NULL : `'${str}'::timestamptz`;
         }
-        case i_pg_1.EDataTypePg.integer:
-        case i_pg_1.EDataTypePg.smallint: {
-            const v = Number(value);
-            return Number.isNaN(v) ? NULL : Math.floor(v);
-        }
-        case i_pg_1.EDataTypePg.text:
-        case i_pg_1.EDataTypePg.character:
-        case i_pg_1.EDataTypePg.varchar:
-        case i_pg_1.EDataTypePg.uuid: {
-            return (0, exports.prepareSqlStringPg)(value);
-        }
-        case i_pg_1.EDataTypePg.json:
-        case i_pg_1.EDataTypePg.jsonb: {
-            return (0, exports.prepareSqlStringPg)(JSON.stringify(value));
-        }
-        case i_pg_1.EDataTypePg.date:
-        case i_pg_1.EDataTypePg.timestamp:
-        case i_pg_1.EDataTypePg.timestamptz: {
-            let v = value;
-            if (value instanceof Date) {
-                v = +value;
-            }
-            else if (value instanceof luxon_1.DateTime) {
-                v = value.toMillis();
+        case 'date':
+            // '2023-09-05'::date
+            return (0, utils_dt_1.dateTimeValue)(value, fieldDefWithNoQuotes, (dt) => `'${dt.toISODate()}'::date`);
+        case 'timetz': // '02:22:17.368+03:00'::time
+        case 'time with time zone':
+        case 'time': // '02:22:17.368'::time
+        case 'time without time zone':
+            return prepareTimeOffset(value, fieldDef);
+        case 'bytea':
+            v = (0, utils_1.binToHexString)(value);
+            return v ? (0, utils_1.q)(v, noQuotes) : common_1.NULL;
+        case 'ARRAY': {
+            v = (0, utils_array_1.arrayToJsonList)(value, fieldDef.arrayType);
+            if (v === common_1.NULL) {
+                return common_1.NULL;
             }
-            else if (typeof value === 'string') {
-                v = luxon_1.DateTime.fromISO(value).toMillis();
-            }
-            switch (fieldDef.dataType) {
-                case i_pg_1.EDataTypePg.date: {
-                    return `'${typeof v === 'number' ? utc$(v).toISODate() : v}'::date`;
-                }
-                case i_pg_1.EDataTypePg.timestamp:
-                case i_pg_1.EDataTypePg.timestamptz: {
-                    return `'${typeof v === 'number' ? utc$(v).toISO() : v}'::timestamptz`;
-                }
-                default:
-                    return `'${v}'`;
-            }
-        }
-        case i_pg_1.EDataTypePg.USER_DEFINED:
-            return (0, exports.prepareSqlStringPg)(value);
-        case i_pg_1.EDataTypePg.ARRAY: {
-            let v = JSON.stringify(value);
-            v = v.replace(/^\[(.*?)]$/, '{$1}');
-            return (0, exports.prepareSqlStringPg)(v);
+            v = `{${v}}`;
+            return fieldDef.noQuotes ? v : (0, exports.quoteStringPg)(v);
         }
+        // 'USER_DEFINED'
         default:
-            return (0, exports.prepareSqlStringPg)(value);
+            return (0, exports.prepareSqlStringPg)(value, fieldDef);
     }
 };
 exports.prepareSqlValuePg = prepareSqlValuePg;

package/dist/cjs/src/pg/prepare-value.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-value.js","sourceRoot":"","sources":["../../../../src/pg/prepare-value.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prepare-value.js","sourceRoot":"","sources":["../../../../src/pg/prepare-value.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/pg/query-pg.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryPg = void 0;
-const pg_pool_1 = require("./pg-pool");
+const pool_pg_1 = require("./pool-pg");
 const common_1 = require("../common");
 const queryPg = async (connectionId, sqlText, sqlValues, throwError, prefix) => {
-    const pool = await (0, pg_pool_1.getPoolPg)(connectionId);
+    const pool = await (0, pool_pg_1.getPoolPg)(connectionId);
     let res;
     try {
         if (Array.isArray(sqlValues)) {

package/dist/cjs/src/pg/query-pg.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-pg.js","sourceRoot":"","sources":["../../../../src/pg/query-pg.ts"],"names":[],"mappings":";;;AACA,uCAAsC;AACtC,sCAAwC;AAGjC,MAAM,OAAO,GAAG,KAAK,EAC1B,YAAoB,EACpB,OAAe,EACf,SAAiB,EACjB,UAAoB,EACpB,MAAe,EAEqB,EAAE;IACtC,MAAM,IAAI,GAAY,MAAM,IAAA,mBAAS,EAAC,YAAY,CAAC,CAAC;IACpD,IAAI,GAAgB,CAAC;IACrB,IAAI;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC5B,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;SAC5C;aAAM;YACL,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SACjC;QACD,OAAO,GAAG,CAAC;KACZ;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,oBAAW,EAAC,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;KAChD;AACH,CAAC,CAAC;AApBW,QAAA,OAAO,WAoBlB"}
+{"version":3,"file":"query-pg.js","sourceRoot":"","sources":["../../../../src/pg/query-pg.ts"],"names":[],"mappings":";;;AACA,uCAAsC;AACtC,sCAAwC;AAIjC,MAAM,OAAO,GAAG,KAAK,EAC1B,YAAoB,EACpB,OAAe,EACf,SAAiB,EACjB,UAAoB,EACpB,MAAe,EAEqB,EAAE;IACtC,MAAM,IAAI,GAAY,MAAM,IAAA,mBAAS,EAAC,YAAY,CAAC,CAAC;IACpD,IAAI,GAAgB,CAAC;IACrB,IAAI,CAAC;QACH,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,oBAAW,EAAC,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;AACH,CAAC,CAAC;AApBW,QAAA,OAAO,WAoBlB"}

package/dist/cjs/src/pg/table-schema-pg.js

@@ -0,0 +1,183 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFieldsAndValuesPg = exports.getTableSchemaPg = void 0;
+// noinspection SqlResolve
+const query_pg_1 = require("./query-pg");
+const logger_error_1 = require("../logger-error");
+const common_1 = require("../common");
+const utils_1 = require("../utils/utils");
+const utils_pg_1 = require("./utils-pg");
+// commonSchemaAndTable: <schema>.<table> :  Staff.nnPersones-personGuid
+// schemaAndTablePg: "<schema>"."<table>" :  "Staff"."nnPersones-personGuid"
+const tableSchemaHash = {};
+const getColumnsSchemaPg_ = async (connectionId, commonSchemaAndTable) => {
+    const [schema, table] = utils_1.schemaTable.to.common(commonSchemaAndTable).split('.');
+    const sql = `SELECT column_name,
+                      column_default,
+                      is_nullable,
+                      data_type,
+                      character_maximum_length,
+                      numeric_precision,
+                      numeric_precision_radix,
+                      numeric_scale,
+                      datetime_precision,
+                      udt_name,
+                      is_generated
+               FROM information_schema.columns
+               WHERE table_name = '${table}'
+                 AND table_schema = '${schema}';`;
+    const result = await (0, query_pg_1.queryPg)(connectionId, sql);
+    const fields = result?.rows || [];
+    const columnsSchema = {};
+    fields.forEach((fieldDef) => {
+        const columnDefault = fieldDef.column_default != null ? fieldDef.column_default : undefined;
+        const name = fieldDef.column_name;
+        const dataType = (0, utils_pg_1.getNormalizedTypePg)(fieldDef.data_type);
+        const fieldSchema = {
+            name,
+            isNullable: /yes/i.test(fieldDef.is_nullable || ''),
+            columnDefault: fieldDef.column_default,
+            hasDefault: columnDefault != null,
+            dataType,
+            length: fieldDef.character_maximum_length,
+            precision: fieldDef.numeric_precision,
+            scale: fieldDef.numeric_scale,
+            radix: fieldDef.numeric_precision_radix,
+            dtPrecision: fieldDef.datetime_precision,
+            arrayType: dataType === 'ARRAY' ? (0, utils_pg_1.getTypeByUdtNamePg)(fieldDef.udt_name) : undefined,
+            readOnly: fieldDef.is_generated === 'ALWAYS', // boolean;
+        };
+        Object.entries(fieldSchema).forEach(([prop, value]) => {
+            if (value == null) {
+                delete fieldSchema[prop];
+            }
+        });
+        columnsSchema[name] = fieldSchema;
+    });
+    return columnsSchema;
+};
+const getPrimaryKey = async (connectionId, commonSchemaAndTable) => {
+    const schemaTablePg = utils_1.schemaTable.to.pg(commonSchemaAndTable);
+    const sql = `
+    SELECT a.attname as f
+    FROM pg_index i
+           JOIN pg_attribute a
+                ON a.attrelid = i.indrelid AND a.attnum = ANY (i.indkey)
+    WHERE i.indrelid = '${schemaTablePg}'::regclass
+    AND i.indisprimary;`;
+    const result = await (0, query_pg_1.queryPg)(connectionId, sql);
+    return (result?.rows || []).map(({ f }) => f);
+};
+const getUniqueConstraints = async (connectionId, commonSchemaAndTable) => {
+    const schemaTablePg = utils_1.schemaTable.to.pg(commonSchemaAndTable);
+    const [schema, table] = utils_1.schemaTable.to.common(commonSchemaAndTable).split('.');
+    const sql = `
+    SELECT UI.cn as cn, UI.cols as cols, CASE WHEN UC.cn IS NULL THEN 'UX' ELSE 'UC' END AS typ
+    FROM (SELECT c.relname as cn, array_to_json(array_agg(a.attname ORDER BY a.attname)) AS cols
+          FROM pg_index i
+                 JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY (i.indkey)
+                 JOIN pg_class AS c ON c.oid = i.indexrelid
+          WHERE i.indrelid = '${schemaTablePg}'::regclass
+              AND i.indisunique
+              AND NOT i.indisprimary
+          GROUP BY c.relname) AS UI
+           LEFT OUTER JOIN (SELECT ccu.constraint_name AS cn
+                            FROM information_schema.table_constraints tc
+                                   JOIN information_schema.constraint_column_usage AS ccu USING (constraint_schema, constraint_name)
+                                   JOIN information_schema.columns AS c ON c.table_schema = tc.constraint_schema
+                              AND tc.table_name = c.table_name AND ccu.column_name = c.column_name
+                            WHERE tc.table_schema = '${schema}'
+                              AND tc.table_name = '${table}'
+                              AND tc.constraint_type = 'UNIQUE'
+                            GROUP BY ccu.constraint_name) AS UC ON UC.cn = UI.cn
+    ORDER BY CASE WHEN UC.cn IS NULL THEN 2 ELSE 1 END
+  `;
+    const result = await (0, query_pg_1.queryPg)(connectionId, sql);
+    const uc = {};
+    result?.rows?.forEach(({ cn, cols }) => {
+        uc[cn] = cols;
+    });
+    return uc;
+};
+const getSerials = async (connectionId, commonSchemaAndTable) => {
+    const fqName = utils_1.schemaTable.to.common(commonSchemaAndTable);
+    const sql = `
+    WITH fq_objects AS (SELECT c.oid,
+                               n.nspname || '.' || c.relname AS fqname,
+                               c.relkind,
+                               c.relname                     AS relation
+                        FROM pg_class c
+                               JOIN pg_namespace n ON n.oid = c.relnamespace),
+         sequences AS (SELECT oid, fqname FROM fq_objects WHERE relkind = 'S'),
+         tables AS (SELECT oid, fqname FROM fq_objects WHERE relkind = 'r')
+    SELECT t.fqname AS tbl, array_to_json(array_agg(a.attname ORDER BY a.attname)) AS cols
+    FROM pg_depend d
+           JOIN sequences s ON s.oid = d.objid
+           JOIN tables t ON t.oid = d.refobjid
+           JOIN pg_attribute a ON a.attrelid = d.refobjid and a.attnum = d.refobjsubid
+    WHERE d.deptype = 'a'
+      AND t.fqname = '${fqName}'
+    GROUP BY t.fqname
+  `;
+    const result = await (0, query_pg_1.queryPg)(connectionId, sql);
+    return result?.rows?.[0]?.cols || [];
+};
+const getTableSchemaPg = async (connectionId, commonSchemaAndTable) => {
+    let tableSchema = tableSchemaHash[commonSchemaAndTable];
+    if (tableSchema) {
+        return tableSchema;
+    }
+    try {
+        const columnsSchema = await getColumnsSchemaPg_(connectionId, commonSchemaAndTable);
+        const pk = await getPrimaryKey(connectionId, commonSchemaAndTable);
+        const uc = await getUniqueConstraints(connectionId, commonSchemaAndTable);
+        const serialsFields = await getSerials(connectionId, commonSchemaAndTable);
+        const defaults = {};
+        Object.values(columnsSchema).forEach((fieldDef) => {
+            const { name: f = '', columnDefault, hasDefault } = fieldDef;
+            if (hasDefault && !serialsFields.includes(f)) {
+                defaults[f] = `${columnDefault}`;
+            }
+        });
+        const fieldsArray = Object.keys(columnsSchema);
+        const readOnlyFields = Object.values(columnsSchema).filter((s) => s.readOnly).map((s) => s.name);
+        const fieldsWoSerialsAndRO = fieldsArray.filter((f) => !serialsFields.includes(f) && !readOnlyFields.includes(f));
+        tableSchema = {
+            columnsSchema, pk, uc, defaults, serialsFields, fieldsArray, fieldsWoSerialsAndRO, readOnlyFields,
+        };
+        tableSchemaHash[commonSchemaAndTable] = tableSchema;
+    }
+    catch (err) {
+        logger_error_1.logger.error(`Failed to get schema for table ${commonSchemaAndTable}`);
+        logger_error_1.logger.error(err);
+        await (0, common_1.graceExit)();
+    }
+    return tableSchema;
+};
+exports.getTableSchemaPg = getTableSchemaPg;
+const getFieldsAndValuesPg = (record, columnsSchema) => {
+    const recordNormalized = {};
+    Object.entries(record).forEach(([f, v]) => {
+        const { dataType } = columnsSchema[f] || {};
+        if (!dataType) {
+            return;
+        }
+        if ((dataType === 'jsonb' || dataType === 'json') && Array.isArray(v)) {
+            recordNormalized[f] = JSON.stringify(v);
+        }
+        else {
+            recordNormalized[f] = v;
+        }
+    });
+    const fields = Object.keys(recordNormalized);
+    const fieldsList = fields.join(', ');
+    const values = Object.values(recordNormalized);
+    const positionsList = fields.map((__, i) => `$${++i}`).join(', ');
+    const setFields = fields.map((f, i) => `${f} = $${++i}`).join(', ');
+    const upsertFields = fields.map((f) => `${f} = EXCLUDED.${f}`).join(',\n');
+    return {
+        fields, fieldsList, values, positionsList, setFields, upsertFields,
+    };
+};
+exports.getFieldsAndValuesPg = getFieldsAndValuesPg;
+//# sourceMappingURL=table-schema-pg.js.map

package/dist/cjs/src/pg/table-schema-pg.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"table-schema-pg.js","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/pg/utils-pg.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNormalizedTypePg = exports.getTypeByUdtNamePg = exports.getJsTypeByTypePg = void 0;
+const getJsTypeByTypePg = (dataType, arrayType) => {
+    switch (dataType) {
+        case 'boolean':
+            return 'boolean';
+        case 'bigint':
+            return 'string | number';
+        case 'integer':
+        case 'numeric':
+        case 'real':
+        case 'smallint':
+            return 'number';
+        case 'text':
+        case 'character':
+        case 'varchar':
+        case 'uuid':
+            return 'string';
+        case 'json':
+        case 'jsonb':
+            return 'any';
+        case 'date':
+        case 'timestamptz':
+        case 'timestamp':
+            return 'string | Date | number';
+        case 'USER_DEFINED':
+            return 'string';
+        case 'ARRAY': {
+            const jsType = (0, exports.getJsTypeByTypePg)(arrayType);
+            return `${jsType}[]`;
+        }
+        default:
+            return 'string';
+    }
+};
+exports.getJsTypeByTypePg = getJsTypeByTypePg;
+const udtNames2TypeMap = {
+    _bit: 'bit',
+    _bool: 'bool',
+    _box: 'box',
+    _bytea: 'bytea',
+    _char: 'char',
+    _circle: 'circle',
+    _date: 'date',
+    _float4: 'real',
+    _float8: 'double precision',
+    _inet: 'inet',
+    _int2: 'smallint',
+    _int4: 'int',
+    _int8: 'bigint',
+    _interval: 'interval',
+    _lseg: 'lseg',
+    _macaddr: 'macaddr',
+    _money: 'money',
+    _numeric: 'numeric',
+    _path: 'path',
+    _point: 'point',
+    _polygon: 'polygon',
+    _text: 'text',
+    _time: 'time',
+    _timestamp: 'timestamp',
+    _timestamptz: 'timestamptz',
+    _timetz: 'timetz',
+    _uuid: 'uuid',
+    _varchar: 'varchar',
+    _xml: 'xml',
+    // _oid: 'oid',
+    // _abstime: 'abstime',
+    // _name: 'name',
+};
+const getTypeByUdtNamePg = (udtName) => {
+    const dataType = udtNames2TypeMap[udtName];
+    return dataType || 'varchar';
+};
+exports.getTypeByUdtNamePg = getTypeByUdtNamePg;
+const typeNormalizationMap = {
+    bool: 'boolean',
+    int2: 'smallint',
+    integer: 'int',
+    int4: 'int',
+    int8: 'bigint',
+    serial2: 'smallserial',
+    serial4: 'serial',
+    serial8: 'bigserial',
+    decimal: 'numeric',
+    float4: 'real',
+    float8: 'double precision',
+    character: 'char',
+    'character varying': 'varchar',
+    'timestamp with time zone': 'timestamptz',
+    'timestamp without time zone': 'timestamp',
+    'time without time zone': 'time',
+    'time with time zone': 'timetz',
+    'bit varying': 'varbit',
+};
+const getNormalizedTypePg = (pgDataType) => typeNormalizationMap[pgDataType] || pgDataType;
+exports.getNormalizedTypePg = getNormalizedTypePg;
+//# sourceMappingURL=utils-pg.js.map

package/dist/cjs/src/pg/utils-pg.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils-pg.js","sourceRoot":"","sources":["../../../../src/pg/utils-pg.ts"],"names":[],"mappings":"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"}