af-db-ts 2.0.86 → 2.0.88
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/src/@types/i-data-types-pg.js.map +1 -1
- package/dist/cjs/src/pg/prepare-value.js +8 -0
- package/dist/cjs/src/pg/prepare-value.js.map +1 -1
- package/dist/cjs/src/pg/table-schema-pg.js +42 -39
- package/dist/cjs/src/pg/table-schema-pg.js.map +1 -1
- package/dist/cjs/src/pg/utils-pg.js +4 -0
- package/dist/cjs/src/pg/utils-pg.js.map +1 -1
- package/dist/esm/src/@types/i-data-types-pg.js.map +1 -1
- package/dist/esm/src/pg/prepare-value.js +8 -0
- package/dist/esm/src/pg/prepare-value.js.map +1 -1
- package/dist/esm/src/pg/table-schema-pg.js +42 -39
- package/dist/esm/src/pg/table-schema-pg.js.map +1 -1
- package/dist/esm/src/pg/utils-pg.js +4 -0
- package/dist/esm/src/pg/utils-pg.js.map +1 -1
- package/dist/types/src/@types/i-data-types-pg.d.ts +1 -1
- package/dist/types/src/@types/i-data-types-pg.d.ts.map +1 -1
- package/dist/types/src/pg/prepare-value.d.ts.map +1 -1
- package/dist/types/src/pg/table-schema-pg.d.ts.map +1 -1
- package/dist/types/src/pg/utils-pg.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/@types/i-data-types-pg.ts +2 -0
- package/src/pg/prepare-value.ts +9 -0
- package/src/pg/table-schema-pg.ts +42 -39
- package/src/pg/utils-pg.ts +6 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-data-types-pg.js","sourceRoot":"","sources":["../../../../src/@types/i-data-types-pg.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"i-data-types-pg.js","sourceRoot":"","sources":["../../../../src/@types/i-data-types-pg.ts"],"names":[],"mappings":";;AAsHA,0BAA0B;AAC1B,WAAW;AACX,eAAe;AACf,YAAY"}
|
|
@@ -125,6 +125,14 @@ const prepareSqlValuePg = (arg) => {
|
|
|
125
125
|
v = `{${v}}`;
|
|
126
126
|
return fieldDef.noQuotes ? v : (0, exports.quoteStringPg)(v);
|
|
127
127
|
}
|
|
128
|
+
case 'vector': {
|
|
129
|
+
v = (0, utils_array_1.arrayToJsonList)(value, 'number');
|
|
130
|
+
if (v === common_1.NULL) {
|
|
131
|
+
return common_1.NULL;
|
|
132
|
+
}
|
|
133
|
+
v = `[${v}]`;
|
|
134
|
+
return fieldDef.noQuotes ? v : (0, exports.quoteStringPg)(v);
|
|
135
|
+
}
|
|
128
136
|
// 'USER_DEFINED'
|
|
129
137
|
default:
|
|
130
138
|
return (0, exports.prepareSqlStringPg)(value, fieldDef);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-value.js","sourceRoot":"","sources":["../../../../src/pg/prepare-value.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"prepare-value.js","sourceRoot":"","sources":["../../../../src/pg/prepare-value.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,10 @@ const getColumnsSchemaPg_ = async (connectionId, commonSchemaAndTable) => {
|
|
|
32
32
|
fields.forEach((fieldDef) => {
|
|
33
33
|
const columnDefault = fieldDef.column_default != null ? fieldDef.column_default : undefined;
|
|
34
34
|
const name = fieldDef.column_name;
|
|
35
|
-
|
|
35
|
+
let dataType = (0, utils_pg_1.getNormalizedTypePg)(fieldDef.data_type);
|
|
36
|
+
if (dataType === 'USER-DEFINED' || dataType === 'USER_DEFINED') {
|
|
37
|
+
dataType = (0, utils_pg_1.getTypeByUdtNamePg)(fieldDef.udt_name);
|
|
38
|
+
}
|
|
36
39
|
const fieldSchema = {
|
|
37
40
|
name,
|
|
38
41
|
isNullable: /yes/i.test(fieldDef.is_nullable || ''),
|
|
@@ -59,11 +62,11 @@ const getColumnsSchemaPg_ = async (connectionId, commonSchemaAndTable) => {
|
|
|
59
62
|
const getPrimaryKey = async (connectionId, commonSchemaAndTable) => {
|
|
60
63
|
const schemaTablePg = utils_1.schemaTable.to.pg(commonSchemaAndTable);
|
|
61
64
|
const sql = `
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
65
|
+
SELECT a.attname as f
|
|
66
|
+
FROM pg_index i
|
|
67
|
+
JOIN pg_attribute a
|
|
68
|
+
ON a.attrelid = i.indrelid AND a.attnum = ANY (i.indkey)
|
|
69
|
+
WHERE i.indrelid = '${schemaTablePg}'::regclass
|
|
67
70
|
AND i.indisprimary;`;
|
|
68
71
|
const result = await (0, query_pg_1.queryPg)(connectionId, sql);
|
|
69
72
|
return (result?.rows || []).map(({ f }) => f);
|
|
@@ -72,25 +75,25 @@ const getUniqueConstraints = async (connectionId, commonSchemaAndTable) => {
|
|
|
72
75
|
const schemaTablePg = utils_1.schemaTable.to.pg(commonSchemaAndTable);
|
|
73
76
|
const [schema, table] = utils_1.schemaTable.to.common(commonSchemaAndTable).split('.');
|
|
74
77
|
const sql = `
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
78
|
+
SELECT UI.cn as cn, UI.cols as cols, CASE WHEN UC.cn IS NULL THEN 'UX' ELSE 'UC' END AS typ
|
|
79
|
+
FROM (SELECT c.relname as cn, array_to_json(array_agg(a.attname ORDER BY a.attname)) AS cols
|
|
80
|
+
FROM pg_index i
|
|
81
|
+
JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY (i.indkey)
|
|
82
|
+
JOIN pg_class AS c ON c.oid = i.indexrelid
|
|
83
|
+
WHERE i.indrelid = '${schemaTablePg}'::regclass
|
|
81
84
|
AND i.indisunique
|
|
82
85
|
AND NOT i.indisprimary
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
86
|
+
GROUP BY c.relname) AS UI
|
|
87
|
+
LEFT OUTER JOIN (SELECT ccu.constraint_name AS cn
|
|
88
|
+
FROM information_schema.table_constraints tc
|
|
89
|
+
JOIN information_schema.constraint_column_usage AS ccu USING (constraint_schema, constraint_name)
|
|
90
|
+
JOIN information_schema.columns AS c ON c.table_schema = tc.constraint_schema
|
|
91
|
+
AND tc.table_name = c.table_name AND ccu.column_name = c.column_name
|
|
92
|
+
WHERE tc.table_schema = '${schema}'
|
|
93
|
+
AND tc.table_name = '${table}'
|
|
94
|
+
AND tc.constraint_type = 'UNIQUE'
|
|
95
|
+
GROUP BY ccu.constraint_name) AS UC ON UC.cn = UI.cn
|
|
96
|
+
ORDER BY CASE WHEN UC.cn IS NULL THEN 2 ELSE 1 END
|
|
94
97
|
`;
|
|
95
98
|
const result = await (0, query_pg_1.queryPg)(connectionId, sql);
|
|
96
99
|
const uc = {};
|
|
@@ -102,22 +105,22 @@ const getUniqueConstraints = async (connectionId, commonSchemaAndTable) => {
|
|
|
102
105
|
const getSerials = async (connectionId, commonSchemaAndTable) => {
|
|
103
106
|
const fqName = utils_1.schemaTable.to.common(commonSchemaAndTable);
|
|
104
107
|
const sql = `
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
108
|
+
WITH fq_objects AS (SELECT c.oid,
|
|
109
|
+
n.nspname || '.' || c.relname AS fqname,
|
|
110
|
+
c.relkind,
|
|
111
|
+
c.relname AS relation
|
|
112
|
+
FROM pg_class c
|
|
113
|
+
JOIN pg_namespace n ON n.oid = c.relnamespace),
|
|
114
|
+
sequences AS (SELECT oid, fqname FROM fq_objects WHERE relkind = 'S'),
|
|
115
|
+
tables AS (SELECT oid, fqname FROM fq_objects WHERE relkind = 'r')
|
|
116
|
+
SELECT t.fqname AS tbl, array_to_json(array_agg(a.attname ORDER BY a.attname)) AS cols
|
|
117
|
+
FROM pg_depend d
|
|
118
|
+
JOIN sequences s ON s.oid = d.objid
|
|
119
|
+
JOIN tables t ON t.oid = d.refobjid
|
|
120
|
+
JOIN pg_attribute a ON a.attrelid = d.refobjid and a.attnum = d.refobjsubid
|
|
121
|
+
WHERE d.deptype = 'a'
|
|
122
|
+
AND t.fqname = '${fqName}'
|
|
123
|
+
GROUP BY t.fqname
|
|
121
124
|
`;
|
|
122
125
|
const result = await (0, query_pg_1.queryPg)(connectionId, sql);
|
|
123
126
|
return result?.rows?.[0]?.cols || [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-schema-pg.js","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":";;;AAAA,0BAA0B;AAC1B,yCAAqC;AACrC,kDAAyC;AACzC,sCAAsC;AAEtC,0CAA6C;AAG7C,yCAAqE;AAErE,wEAAwE;AACxE,4EAA4E;AAE5E,MAAM,eAAe,GAAuD,EAAE,CAAC;AAE/E,MAAM,mBAAmB,GAAG,KAAK,EAAE,YAAoB,EAAE,oBAA4B,EAA6B,EAAE;IAClH,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,mBAAW,CAAC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/E,MAAM,GAAG,GAAG;;;;;;;;;;;;qCAYuB,KAAK;uCACH,MAAM,IAAI,CAAC;IAChD,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAO,EAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;IAClC,MAAM,aAAa,GAAqB,EAAE,CAAC;IAC3C,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC1B,MAAM,aAAa,GAAG,QAAQ,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5F,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC;QAClC,
|
|
1
|
+
{"version":3,"file":"table-schema-pg.js","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,6 +54,7 @@ const getJsTypeByTypePg = (dataType, arrayType) => {
|
|
|
54
54
|
case 'timetz':
|
|
55
55
|
case 'time with time zone':
|
|
56
56
|
return 'string | Date | number';
|
|
57
|
+
case 'USER-DEFINED':
|
|
57
58
|
case 'USER_DEFINED':
|
|
58
59
|
return 'string';
|
|
59
60
|
// Не задействованы
|
|
@@ -81,6 +82,8 @@ const getJsTypeByTypePg = (dataType, arrayType) => {
|
|
|
81
82
|
const jsType = (0, exports.getJsTypeByTypePg)(arrayType);
|
|
82
83
|
return `${jsType}[]`;
|
|
83
84
|
}
|
|
85
|
+
case 'vector':
|
|
86
|
+
return `number[]`;
|
|
84
87
|
default:
|
|
85
88
|
return 'string';
|
|
86
89
|
}
|
|
@@ -116,6 +119,7 @@ const udtNames2TypeMap = {
|
|
|
116
119
|
_uuid: 'uuid',
|
|
117
120
|
_varchar: 'varchar',
|
|
118
121
|
_xml: 'xml',
|
|
122
|
+
vector: 'vector',
|
|
119
123
|
// _oid: 'oid',
|
|
120
124
|
// _abstime: 'abstime',
|
|
121
125
|
// _name: 'name',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils-pg.js","sourceRoot":"","sources":["../../../../src/pg/utils-pg.ts"],"names":[],"mappings":";;;AAEO,MAAM,iBAAiB,GAAG,CAAC,QAAsB,EAAE,SAAuB,EAAU,EAAE;IAC3F,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,KAAK,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QAEnB,KAAK,QAAQ;YACX,OAAO,iBAAiB,CAAC;QAE3B,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK,CAAC;QACX,KAAK,SAAS,CAAC;QACf,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,MAAM,CAAC;QACZ,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO,CAAC;QACb,KAAK,kBAAkB,CAAC;QACxB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAElB,KAAK,aAAa,CAAC;QACnB,KAAK,SAAS,CAAC;QACf,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,WAAW,CAAC;QACjB,KAAK,SAAS;YACZ,OAAO,QAAQ,CAAC;QAElB,KAAK,WAAW,CAAC;QACjB,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS,CAAC;QACf,KAAK,mBAAmB,CAAC;QACzB,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK;YACR,OAAO,QAAQ,CAAC;QAElB,KAAK,OAAO;YACV,OAAO,QAAQ,CAAC;QAElB,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO;YACV,OAAO,KAAK,CAAC;QAEf,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,aAAa,CAAC;QACnB,KAAK,0BAA0B,CAAC;QAChC,KAAK,WAAW,CAAC;QACjB,KAAK,6BAA6B,CAAC;QACnC,KAAK,wBAAwB,CAAC;QAC9B,KAAK,QAAQ,CAAC;QACd,KAAK,qBAAqB;YACxB,OAAO,wBAAwB,CAAC;QAElC,KAAK,cAAc;YACjB,OAAO,QAAQ,CAAC;QAElB,mBAAmB;QACnB,KAAK,aAAa,CAAC;QACnB,KAAK,QAAQ,CAAC;QACd,KAAK,KAAK,CAAC,CAAC,6BAA6B;QACzC,KAAK,MAAM,CAAC,CAAC,+BAA+B;QAC5C,KAAK,QAAQ,CAAC,CAAC,oBAAoB;QACnC,KAAK,MAAM,CAAC,CAAC,4BAA4B;QACzC,KAAK,MAAM,CAAC,CAAC,2BAA2B;QACxC,KAAK,UAAU,CAAC,CAAC,sCAAsC;QACvD,KAAK,MAAM,CAAC,CAAC,0BAA0B;QACvC,KAAK,SAAS,CAAC,CAAC,qCAAqC;QACrD,KAAK,UAAU,CAAC,CAAC,qDAAqD;QACtE,KAAK,MAAM,CAAC,CAAC,4BAA4B;QACzC,KAAK,QAAQ,CAAC,CAAC,iCAAiC;QAChD,KAAK,aAAa,CAAC,CAAC,qCAAqC;QACzD,KAAK,OAAO,CAAC,CAAC,6BAA6B;QAC3C,KAAK,SAAS,CAAC,CAAC,mCAAmC;QACnD,KAAK,SAAS,CAAC,CAAC,oBAAoB;QACpC,KAAK,UAAU,CAAC,CAAC,uBAAuB;QACxC,KAAK,eAAe,EAAE,mEAAmE;YACvF,OAAO,QAAQ,CAAC;QAElB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,MAAM,GAAG,IAAA,yBAAiB,EAAC,SAAS,CAAC,CAAC;YAC5C,OAAO,GAAG,MAAM,IAAI,CAAC;QACvB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils-pg.js","sourceRoot":"","sources":["../../../../src/pg/utils-pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-data-types-pg.js","sourceRoot":"","sources":["../../../../src/@types/i-data-types-pg.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"i-data-types-pg.js","sourceRoot":"","sources":["../../../../src/@types/i-data-types-pg.ts"],"names":[],"mappings":";AAsHA,0BAA0B;AAC1B,WAAW;AACX,eAAe;AACf,YAAY"}
|
|
@@ -119,6 +119,14 @@ export const prepareSqlValuePg = (arg) => {
|
|
|
119
119
|
v = `{${v}}`;
|
|
120
120
|
return fieldDef.noQuotes ? v : quoteStringPg(v);
|
|
121
121
|
}
|
|
122
|
+
case 'vector': {
|
|
123
|
+
v = arrayToJsonList(value, 'number');
|
|
124
|
+
if (v === NULL) {
|
|
125
|
+
return NULL;
|
|
126
|
+
}
|
|
127
|
+
v = `[${v}]`;
|
|
128
|
+
return fieldDef.noQuotes ? v : quoteStringPg(v);
|
|
129
|
+
}
|
|
122
130
|
// 'USER_DEFINED'
|
|
123
131
|
default:
|
|
124
132
|
return prepareSqlStringPg(value, fieldDef);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-value.js","sourceRoot":"","sources":["../../../../src/pg/prepare-value.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prepare-value.js","sourceRoot":"","sources":["../../../../src/pg/prepare-value.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,10 @@ const getColumnsSchemaPg_ = async (connectionId, commonSchemaAndTable) => {
|
|
|
29
29
|
fields.forEach((fieldDef) => {
|
|
30
30
|
const columnDefault = fieldDef.column_default != null ? fieldDef.column_default : undefined;
|
|
31
31
|
const name = fieldDef.column_name;
|
|
32
|
-
|
|
32
|
+
let dataType = getNormalizedTypePg(fieldDef.data_type);
|
|
33
|
+
if (dataType === 'USER-DEFINED' || dataType === 'USER_DEFINED') {
|
|
34
|
+
dataType = getTypeByUdtNamePg(fieldDef.udt_name);
|
|
35
|
+
}
|
|
33
36
|
const fieldSchema = {
|
|
34
37
|
name,
|
|
35
38
|
isNullable: /yes/i.test(fieldDef.is_nullable || ''),
|
|
@@ -56,11 +59,11 @@ const getColumnsSchemaPg_ = async (connectionId, commonSchemaAndTable) => {
|
|
|
56
59
|
const getPrimaryKey = async (connectionId, commonSchemaAndTable) => {
|
|
57
60
|
const schemaTablePg = schemaTable.to.pg(commonSchemaAndTable);
|
|
58
61
|
const sql = `
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
SELECT a.attname as f
|
|
63
|
+
FROM pg_index i
|
|
64
|
+
JOIN pg_attribute a
|
|
65
|
+
ON a.attrelid = i.indrelid AND a.attnum = ANY (i.indkey)
|
|
66
|
+
WHERE i.indrelid = '${schemaTablePg}'::regclass
|
|
64
67
|
AND i.indisprimary;`;
|
|
65
68
|
const result = await queryPg(connectionId, sql);
|
|
66
69
|
return (result?.rows || []).map(({ f }) => f);
|
|
@@ -69,25 +72,25 @@ const getUniqueConstraints = async (connectionId, commonSchemaAndTable) => {
|
|
|
69
72
|
const schemaTablePg = schemaTable.to.pg(commonSchemaAndTable);
|
|
70
73
|
const [schema, table] = schemaTable.to.common(commonSchemaAndTable).split('.');
|
|
71
74
|
const sql = `
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
75
|
+
SELECT UI.cn as cn, UI.cols as cols, CASE WHEN UC.cn IS NULL THEN 'UX' ELSE 'UC' END AS typ
|
|
76
|
+
FROM (SELECT c.relname as cn, array_to_json(array_agg(a.attname ORDER BY a.attname)) AS cols
|
|
77
|
+
FROM pg_index i
|
|
78
|
+
JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY (i.indkey)
|
|
79
|
+
JOIN pg_class AS c ON c.oid = i.indexrelid
|
|
80
|
+
WHERE i.indrelid = '${schemaTablePg}'::regclass
|
|
78
81
|
AND i.indisunique
|
|
79
82
|
AND NOT i.indisprimary
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
83
|
+
GROUP BY c.relname) AS UI
|
|
84
|
+
LEFT OUTER JOIN (SELECT ccu.constraint_name AS cn
|
|
85
|
+
FROM information_schema.table_constraints tc
|
|
86
|
+
JOIN information_schema.constraint_column_usage AS ccu USING (constraint_schema, constraint_name)
|
|
87
|
+
JOIN information_schema.columns AS c ON c.table_schema = tc.constraint_schema
|
|
88
|
+
AND tc.table_name = c.table_name AND ccu.column_name = c.column_name
|
|
89
|
+
WHERE tc.table_schema = '${schema}'
|
|
90
|
+
AND tc.table_name = '${table}'
|
|
91
|
+
AND tc.constraint_type = 'UNIQUE'
|
|
92
|
+
GROUP BY ccu.constraint_name) AS UC ON UC.cn = UI.cn
|
|
93
|
+
ORDER BY CASE WHEN UC.cn IS NULL THEN 2 ELSE 1 END
|
|
91
94
|
`;
|
|
92
95
|
const result = await queryPg(connectionId, sql);
|
|
93
96
|
const uc = {};
|
|
@@ -99,22 +102,22 @@ const getUniqueConstraints = async (connectionId, commonSchemaAndTable) => {
|
|
|
99
102
|
const getSerials = async (connectionId, commonSchemaAndTable) => {
|
|
100
103
|
const fqName = schemaTable.to.common(commonSchemaAndTable);
|
|
101
104
|
const sql = `
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
105
|
+
WITH fq_objects AS (SELECT c.oid,
|
|
106
|
+
n.nspname || '.' || c.relname AS fqname,
|
|
107
|
+
c.relkind,
|
|
108
|
+
c.relname AS relation
|
|
109
|
+
FROM pg_class c
|
|
110
|
+
JOIN pg_namespace n ON n.oid = c.relnamespace),
|
|
111
|
+
sequences AS (SELECT oid, fqname FROM fq_objects WHERE relkind = 'S'),
|
|
112
|
+
tables AS (SELECT oid, fqname FROM fq_objects WHERE relkind = 'r')
|
|
113
|
+
SELECT t.fqname AS tbl, array_to_json(array_agg(a.attname ORDER BY a.attname)) AS cols
|
|
114
|
+
FROM pg_depend d
|
|
115
|
+
JOIN sequences s ON s.oid = d.objid
|
|
116
|
+
JOIN tables t ON t.oid = d.refobjid
|
|
117
|
+
JOIN pg_attribute a ON a.attrelid = d.refobjid and a.attnum = d.refobjsubid
|
|
118
|
+
WHERE d.deptype = 'a'
|
|
119
|
+
AND t.fqname = '${fqName}'
|
|
120
|
+
GROUP BY t.fqname
|
|
118
121
|
`;
|
|
119
122
|
const result = await queryPg(connectionId, sql);
|
|
120
123
|
return result?.rows?.[0]?.cols || [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-schema-pg.js","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErE,wEAAwE;AACxE,4EAA4E;AAE5E,MAAM,eAAe,GAAuD,EAAE,CAAC;AAE/E,MAAM,mBAAmB,GAAG,KAAK,EAAE,YAAoB,EAAE,oBAA4B,EAA6B,EAAE;IAClH,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/E,MAAM,GAAG,GAAG;;;;;;;;;;;;qCAYuB,KAAK;uCACH,MAAM,IAAI,CAAC;IAChD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;IAClC,MAAM,aAAa,GAAqB,EAAE,CAAC;IAC3C,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC1B,MAAM,aAAa,GAAG,QAAQ,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5F,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC;QAClC,
|
|
1
|
+
{"version":3,"file":"table-schema-pg.js","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,6 +51,7 @@ export const getJsTypeByTypePg = (dataType, arrayType) => {
|
|
|
51
51
|
case 'timetz':
|
|
52
52
|
case 'time with time zone':
|
|
53
53
|
return 'string | Date | number';
|
|
54
|
+
case 'USER-DEFINED':
|
|
54
55
|
case 'USER_DEFINED':
|
|
55
56
|
return 'string';
|
|
56
57
|
// Не задействованы
|
|
@@ -78,6 +79,8 @@ export const getJsTypeByTypePg = (dataType, arrayType) => {
|
|
|
78
79
|
const jsType = getJsTypeByTypePg(arrayType);
|
|
79
80
|
return `${jsType}[]`;
|
|
80
81
|
}
|
|
82
|
+
case 'vector':
|
|
83
|
+
return `number[]`;
|
|
81
84
|
default:
|
|
82
85
|
return 'string';
|
|
83
86
|
}
|
|
@@ -112,6 +115,7 @@ const udtNames2TypeMap = {
|
|
|
112
115
|
_uuid: 'uuid',
|
|
113
116
|
_varchar: 'varchar',
|
|
114
117
|
_xml: 'xml',
|
|
118
|
+
vector: 'vector',
|
|
115
119
|
// _oid: 'oid',
|
|
116
120
|
// _abstime: 'abstime',
|
|
117
121
|
// _name: 'name',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils-pg.js","sourceRoot":"","sources":["../../../../src/pg/utils-pg.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAAsB,EAAE,SAAuB,EAAU,EAAE;IAC3F,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,KAAK,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QAEnB,KAAK,QAAQ;YACX,OAAO,iBAAiB,CAAC;QAE3B,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK,CAAC;QACX,KAAK,SAAS,CAAC;QACf,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,MAAM,CAAC;QACZ,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO,CAAC;QACb,KAAK,kBAAkB,CAAC;QACxB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAElB,KAAK,aAAa,CAAC;QACnB,KAAK,SAAS,CAAC;QACf,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,WAAW,CAAC;QACjB,KAAK,SAAS;YACZ,OAAO,QAAQ,CAAC;QAElB,KAAK,WAAW,CAAC;QACjB,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS,CAAC;QACf,KAAK,mBAAmB,CAAC;QACzB,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK;YACR,OAAO,QAAQ,CAAC;QAElB,KAAK,OAAO;YACV,OAAO,QAAQ,CAAC;QAElB,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO;YACV,OAAO,KAAK,CAAC;QAEf,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,aAAa,CAAC;QACnB,KAAK,0BAA0B,CAAC;QAChC,KAAK,WAAW,CAAC;QACjB,KAAK,6BAA6B,CAAC;QACnC,KAAK,wBAAwB,CAAC;QAC9B,KAAK,QAAQ,CAAC;QACd,KAAK,qBAAqB;YACxB,OAAO,wBAAwB,CAAC;QAElC,KAAK,cAAc;YACjB,OAAO,QAAQ,CAAC;QAElB,mBAAmB;QACnB,KAAK,aAAa,CAAC;QACnB,KAAK,QAAQ,CAAC;QACd,KAAK,KAAK,CAAC,CAAC,6BAA6B;QACzC,KAAK,MAAM,CAAC,CAAC,+BAA+B;QAC5C,KAAK,QAAQ,CAAC,CAAC,oBAAoB;QACnC,KAAK,MAAM,CAAC,CAAC,4BAA4B;QACzC,KAAK,MAAM,CAAC,CAAC,2BAA2B;QACxC,KAAK,UAAU,CAAC,CAAC,sCAAsC;QACvD,KAAK,MAAM,CAAC,CAAC,0BAA0B;QACvC,KAAK,SAAS,CAAC,CAAC,qCAAqC;QACrD,KAAK,UAAU,CAAC,CAAC,qDAAqD;QACtE,KAAK,MAAM,CAAC,CAAC,4BAA4B;QACzC,KAAK,QAAQ,CAAC,CAAC,iCAAiC;QAChD,KAAK,aAAa,CAAC,CAAC,qCAAqC;QACzD,KAAK,OAAO,CAAC,CAAC,6BAA6B;QAC3C,KAAK,SAAS,CAAC,CAAC,mCAAmC;QACnD,KAAK,SAAS,CAAC,CAAC,oBAAoB;QACpC,KAAK,UAAU,CAAC,CAAC,uBAAuB;QACxC,KAAK,eAAe,EAAE,mEAAmE;YACvF,OAAO,QAAQ,CAAC;QAElB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,MAAM,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAC5C,OAAO,GAAG,MAAM,IAAI,CAAC;QACvB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils-pg.js","sourceRoot":"","sources":["../../../../src/pg/utils-pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export type TDataTypePg = 'bit' | // bit[(n)] - fixed-length bit string
|
|
|
12
12
|
'timestamp without time zone' | 'date' | 'time' | // time [(p)]
|
|
13
13
|
'time without time zone' | // time [(p)] without time zone
|
|
14
14
|
'timetz' | 'time with time zone' | // time [(p)] with time zone
|
|
15
|
-
'ARRAY' | 'USER_DEFINED' | 'smallserial' | 'serial2' | 'serial' | 'serial4' | 'bigserial' | 'serial8' | 'bit varying' | // varbit[(n)] / bit varying[(n)] - variable-length bit string
|
|
15
|
+
'ARRAY' | 'USER_DEFINED' | 'USER-DEFINED' | 'vector' | 'smallserial' | 'serial2' | 'serial' | 'serial4' | 'bigserial' | 'serial8' | 'bit varying' | // varbit[(n)] / bit varying[(n)] - variable-length bit string
|
|
16
16
|
'varbit' | 'box' | // rectangular box on a plane
|
|
17
17
|
'cidr' | // IPv4 or IPv6 network address
|
|
18
18
|
'circle' | // circle on a plane
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-data-types-pg.d.ts","sourceRoot":"","sources":["../../../../src/@types/i-data-types-pg.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GACrB,KAAK,GAAG,qCAAqC;AAC7C,MAAM,GACN,SAAS,GAET,UAAU,GACV,MAAM,GAEN,KAAK,GACL,SAAS,GACT,MAAM,GAEN,QAAQ,GACR,MAAM,GAEN,SAAS,GAAG,kBAAkB;AAC9B,SAAS,GAAG,kBAAkB;AAE9B,MAAM,GAAG,4CAA4C;AACrD,QAAQ,GAER,OAAO,GAEP,kBAAkB,GAClB,QAAQ,GAER,MAAM,GACN,OAAO,GAEP,WAAW,GAAG,iBAAiB;AAC/B,MAAM,GAAG,iBAAiB;AAE1B,SAAS,GAAG,eAAe;AAC3B,mBAAmB,GAAG,yBAAyB;AAE/C,QAAQ,GAAG,gBAAgB;AAC3B,MAAM,GAEN,MAAM,GAEN,OAAO,GAEP,aAAa,GAAG,iCAAiC;AACjD,0BAA0B,GAC1B,WAAW,GAAG,sCAAsC;AACpD,6BAA6B,GAE7B,MAAM,GAEN,MAAM,GAAG,aAAa;AACtB,wBAAwB,GAAG,+BAA+B;AAC1D,QAAQ,GACR,qBAAqB,GAAG,4BAA4B;AAEpD,OAAO,GACP,cAAc,
|
|
1
|
+
{"version":3,"file":"i-data-types-pg.d.ts","sourceRoot":"","sources":["../../../../src/@types/i-data-types-pg.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GACrB,KAAK,GAAG,qCAAqC;AAC7C,MAAM,GACN,SAAS,GAET,UAAU,GACV,MAAM,GAEN,KAAK,GACL,SAAS,GACT,MAAM,GAEN,QAAQ,GACR,MAAM,GAEN,SAAS,GAAG,kBAAkB;AAC9B,SAAS,GAAG,kBAAkB;AAE9B,MAAM,GAAG,4CAA4C;AACrD,QAAQ,GAER,OAAO,GAEP,kBAAkB,GAClB,QAAQ,GAER,MAAM,GACN,OAAO,GAEP,WAAW,GAAG,iBAAiB;AAC/B,MAAM,GAAG,iBAAiB;AAE1B,SAAS,GAAG,eAAe;AAC3B,mBAAmB,GAAG,yBAAyB;AAE/C,QAAQ,GAAG,gBAAgB;AAC3B,MAAM,GAEN,MAAM,GAEN,OAAO,GAEP,aAAa,GAAG,iCAAiC;AACjD,0BAA0B,GAC1B,WAAW,GAAG,sCAAsC;AACpD,6BAA6B,GAE7B,MAAM,GAEN,MAAM,GAAG,aAAa;AACtB,wBAAwB,GAAG,+BAA+B;AAC1D,QAAQ,GACR,qBAAqB,GAAG,4BAA4B;AAEpD,OAAO,GACP,cAAc,GACd,cAAc,GACd,QAAQ,GAGR,aAAa,GACb,SAAS,GACT,QAAQ,GACR,SAAS,GACT,WAAW,GACX,SAAS,GACT,aAAa,GAAG,8DAA8D;AAC9E,QAAQ,GACR,KAAK,GAAG,6BAA6B;AACrC,MAAM,GAAG,+BAA+B;AACxC,QAAQ,GAAG,oBAAoB;AAC/B,MAAM,GAAG,4BAA4B;AACrC,UAAU,GAAG,sCAAsC;AACnD,MAAM,GAAG,2BAA2B;AACpC,MAAM,GAAG,0BAA0B;AACnC,SAAS,GAAG,qCAAqC;AACjD,UAAU,GAAG,qDAAqD;AAClE,MAAM,GAAG,4BAA4B;AACrC,QAAQ,GAAG,iCAAiC;AAC5C,aAAa,GAAG,qCAAqC;AACrD,OAAO,GAAG,6BAA6B;AACvC,SAAS,GAAG,mCAAmC;AAC/C,SAAS,GAAG,oBAAoB;AAChC,UAAU,GAAG,uBAAuB;AACpC,eAAe,GAAG,mEAAmE;AACrF,KAAK,CAAA;AAEP,MAAM,MAAM,aAAa,GACvB,OAAO,GACP,OAAO,GACP,OAAO,GACP,SAAS,GACT,SAAS,GACT,UAAU,GACV,QAAQ,GACR,OAAO,GACP,UAAU,GACV,OAAO,GACP,OAAO,GACP,OAAO,GACP,YAAY,GACZ,cAAc,GAEd,OAAO,GACP,QAAQ,GACR,MAAM,GACN,OAAO,GACP,UAAU,GACV,QAAQ,GACR,OAAO,GACP,OAAO,GACP,MAAM,GACN,SAAS,GACT,UAAU,GACV,OAAO,GACP,MAAM,GACN,WAAW,GACX,SAAS,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-value.d.ts","sourceRoot":"","sources":["../../../../src/pg/prepare-value.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAOjC,eAAO,MAAM,aAAa,UAAW,MAAM,KAAG,MAK7C,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAW,GAAG,YAAY,WAAW,KAAG,MAAM,GAAG,WAa/E,CAAC;AAgBF,eAAO,MAAM,aAAa,UAAW,GAAG,YAAY,MAAM,GAAG,OAAO,KAAG,MAAM,GAAG,WAM/E,CAAC;AAEF,eAAO,MAAM,iBAAiB,QAAS;IAAE,KAAK,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,WAAW,CAAA;CAAE,KAAG,
|
|
1
|
+
{"version":3,"file":"prepare-value.d.ts","sourceRoot":"","sources":["../../../../src/pg/prepare-value.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAOjC,eAAO,MAAM,aAAa,UAAW,MAAM,KAAG,MAK7C,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAW,GAAG,YAAY,WAAW,KAAG,MAAM,GAAG,WAa/E,CAAC;AAgBF,eAAO,MAAM,aAAa,UAAW,GAAG,YAAY,MAAM,GAAG,OAAO,KAAG,MAAM,GAAG,WAM/E,CAAC;AAEF,eAAO,MAAM,iBAAiB,QAAS;IAAE,KAAK,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,WAAW,CAAA;CAAE,KAAG,GA2G9E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-schema-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,cAAc,EAAE,gBAAgB,EAAwB,MAAM,gBAAgB,CAAC;AAErG,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"table-schema-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,cAAc,EAAE,gBAAgB,EAAwB,MAAM,gBAAgB,CAAC;AAErG,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAiI/C,eAAO,MAAM,gBAAgB,iBAAwB,MAAM,wBAAwB,MAAM,KAAG,QAAQ,cAAc,CA+BjH,CAAC;AAEF,eAAO,MAAM,oBAAoB,8DAAgE,gBAAgB;YAErG,MAAM,EAAE;gBACJ,MAAM;YACV,GAAG,EAAE;mBACE,MAAM;eACV,MAAM;kBACH,MAAM;CAuBvB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/utils-pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAEvE,eAAO,MAAM,iBAAiB,cAAe,WAAW,cAAc,WAAW,KAAG,
|
|
1
|
+
{"version":3,"file":"utils-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/utils-pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAEvE,eAAO,MAAM,iBAAiB,cAAe,WAAW,cAAc,WAAW,KAAG,MAkGnF,CAAC;AAqCF,eAAO,MAAM,kBAAkB,YAAa,aAAa,KAAG,WAG3D,CAAC;AAuBF,eAAO,MAAM,mBAAmB,eAAgB,WAAW,KAAG,WAA6D,CAAC"}
|
package/package.json
CHANGED
package/src/pg/prepare-value.ts
CHANGED
|
@@ -147,6 +147,15 @@ export const prepareSqlValuePg = (arg: { value: any, fieldDef: IFieldDefPg }): a
|
|
|
147
147
|
v = `{${v}}`;
|
|
148
148
|
return fieldDef.noQuotes ? v : quoteStringPg(v);
|
|
149
149
|
}
|
|
150
|
+
|
|
151
|
+
case 'vector': {
|
|
152
|
+
v = arrayToJsonList(value, 'number');
|
|
153
|
+
if (v === NULL) {
|
|
154
|
+
return NULL;
|
|
155
|
+
}
|
|
156
|
+
v = `[${v}]`;
|
|
157
|
+
return fieldDef.noQuotes ? v : quoteStringPg(v);
|
|
158
|
+
}
|
|
150
159
|
// 'USER_DEFINED'
|
|
151
160
|
default:
|
|
152
161
|
return prepareSqlStringPg(value, fieldDef);
|
|
@@ -35,7 +35,10 @@ const getColumnsSchemaPg_ = async (connectionId: string, commonSchemaAndTable: s
|
|
|
35
35
|
fields.forEach((fieldDef) => {
|
|
36
36
|
const columnDefault = fieldDef.column_default != null ? fieldDef.column_default : undefined;
|
|
37
37
|
const name = fieldDef.column_name;
|
|
38
|
-
|
|
38
|
+
let dataType: TDataTypePg = getNormalizedTypePg(fieldDef.data_type);
|
|
39
|
+
if (dataType === 'USER-DEFINED' || dataType === 'USER_DEFINED') {
|
|
40
|
+
dataType = getTypeByUdtNamePg(fieldDef.udt_name);
|
|
41
|
+
}
|
|
39
42
|
const fieldSchema: IFieldDefPg = {
|
|
40
43
|
name,
|
|
41
44
|
isNullable: /yes/i.test(fieldDef.is_nullable || ''),
|
|
@@ -63,11 +66,11 @@ const getColumnsSchemaPg_ = async (connectionId: string, commonSchemaAndTable: s
|
|
|
63
66
|
const getPrimaryKey = async (connectionId: string, commonSchemaAndTable: string): Promise<string[]> => {
|
|
64
67
|
const schemaTablePg = schemaTable.to.pg(commonSchemaAndTable);
|
|
65
68
|
const sql = `
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
69
|
+
SELECT a.attname as f
|
|
70
|
+
FROM pg_index i
|
|
71
|
+
JOIN pg_attribute a
|
|
72
|
+
ON a.attrelid = i.indrelid AND a.attnum = ANY (i.indkey)
|
|
73
|
+
WHERE i.indrelid = '${schemaTablePg}'::regclass
|
|
71
74
|
AND i.indisprimary;`;
|
|
72
75
|
const result = await queryPg(connectionId, sql);
|
|
73
76
|
|
|
@@ -78,25 +81,25 @@ const getUniqueConstraints = async (connectionId: string, commonSchemaAndTable:
|
|
|
78
81
|
const schemaTablePg = schemaTable.to.pg(commonSchemaAndTable);
|
|
79
82
|
const [schema, table] = schemaTable.to.common(commonSchemaAndTable).split('.');
|
|
80
83
|
const sql = `
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
84
|
+
SELECT UI.cn as cn, UI.cols as cols, CASE WHEN UC.cn IS NULL THEN 'UX' ELSE 'UC' END AS typ
|
|
85
|
+
FROM (SELECT c.relname as cn, array_to_json(array_agg(a.attname ORDER BY a.attname)) AS cols
|
|
86
|
+
FROM pg_index i
|
|
87
|
+
JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY (i.indkey)
|
|
88
|
+
JOIN pg_class AS c ON c.oid = i.indexrelid
|
|
89
|
+
WHERE i.indrelid = '${schemaTablePg}'::regclass
|
|
87
90
|
AND i.indisunique
|
|
88
91
|
AND NOT i.indisprimary
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
92
|
+
GROUP BY c.relname) AS UI
|
|
93
|
+
LEFT OUTER JOIN (SELECT ccu.constraint_name AS cn
|
|
94
|
+
FROM information_schema.table_constraints tc
|
|
95
|
+
JOIN information_schema.constraint_column_usage AS ccu USING (constraint_schema, constraint_name)
|
|
96
|
+
JOIN information_schema.columns AS c ON c.table_schema = tc.constraint_schema
|
|
97
|
+
AND tc.table_name = c.table_name AND ccu.column_name = c.column_name
|
|
98
|
+
WHERE tc.table_schema = '${schema}'
|
|
99
|
+
AND tc.table_name = '${table}'
|
|
100
|
+
AND tc.constraint_type = 'UNIQUE'
|
|
101
|
+
GROUP BY ccu.constraint_name) AS UC ON UC.cn = UI.cn
|
|
102
|
+
ORDER BY CASE WHEN UC.cn IS NULL THEN 2 ELSE 1 END
|
|
100
103
|
`;
|
|
101
104
|
const result = await queryPg(connectionId, sql);
|
|
102
105
|
const uc: TUniqueConstraintsPg = {};
|
|
@@ -109,22 +112,22 @@ const getUniqueConstraints = async (connectionId: string, commonSchemaAndTable:
|
|
|
109
112
|
const getSerials = async (connectionId: string, commonSchemaAndTable: string): Promise<string[]> => {
|
|
110
113
|
const fqName = schemaTable.to.common(commonSchemaAndTable);
|
|
111
114
|
const sql = `
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
115
|
+
WITH fq_objects AS (SELECT c.oid,
|
|
116
|
+
n.nspname || '.' || c.relname AS fqname,
|
|
117
|
+
c.relkind,
|
|
118
|
+
c.relname AS relation
|
|
119
|
+
FROM pg_class c
|
|
120
|
+
JOIN pg_namespace n ON n.oid = c.relnamespace),
|
|
121
|
+
sequences AS (SELECT oid, fqname FROM fq_objects WHERE relkind = 'S'),
|
|
122
|
+
tables AS (SELECT oid, fqname FROM fq_objects WHERE relkind = 'r')
|
|
123
|
+
SELECT t.fqname AS tbl, array_to_json(array_agg(a.attname ORDER BY a.attname)) AS cols
|
|
124
|
+
FROM pg_depend d
|
|
125
|
+
JOIN sequences s ON s.oid = d.objid
|
|
126
|
+
JOIN tables t ON t.oid = d.refobjid
|
|
127
|
+
JOIN pg_attribute a ON a.attrelid = d.refobjid and a.attnum = d.refobjsubid
|
|
128
|
+
WHERE d.deptype = 'a'
|
|
129
|
+
AND t.fqname = '${fqName}'
|
|
130
|
+
GROUP BY t.fqname
|
|
128
131
|
`;
|
|
129
132
|
const result = await queryPg(connectionId, sql);
|
|
130
133
|
return result?.rows?.[0]?.cols || [];
|
package/src/pg/utils-pg.ts
CHANGED
|
@@ -61,6 +61,7 @@ export const getJsTypeByTypePg = (dataType?: TDataTypePg, arrayType?: TDataTypeP
|
|
|
61
61
|
case 'time with time zone':
|
|
62
62
|
return 'string | Date | number';
|
|
63
63
|
|
|
64
|
+
case 'USER-DEFINED':
|
|
64
65
|
case 'USER_DEFINED':
|
|
65
66
|
return 'string';
|
|
66
67
|
|
|
@@ -90,6 +91,10 @@ export const getJsTypeByTypePg = (dataType?: TDataTypePg, arrayType?: TDataTypeP
|
|
|
90
91
|
const jsType = getJsTypeByTypePg(arrayType);
|
|
91
92
|
return `${jsType}[]`;
|
|
92
93
|
}
|
|
94
|
+
|
|
95
|
+
case 'vector':
|
|
96
|
+
return `number[]`;
|
|
97
|
+
|
|
93
98
|
default:
|
|
94
99
|
return 'string';
|
|
95
100
|
}
|
|
@@ -125,6 +130,7 @@ const udtNames2TypeMap: { [udtName: string]: TDataTypePg } = {
|
|
|
125
130
|
_uuid: 'uuid',
|
|
126
131
|
_varchar: 'varchar',
|
|
127
132
|
_xml: 'xml',
|
|
133
|
+
vector: 'vector',
|
|
128
134
|
// _oid: 'oid',
|
|
129
135
|
// _abstime: 'abstime',
|
|
130
136
|
// _name: 'name',
|