typesql-cli 0.15.0-experimental.4 → 0.15.0
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/README.md +5 -1
- package/code-generator.d.ts.map +1 -1
- package/code-generator.js +4 -2
- package/code-generator.js.map +1 -1
- package/code-generator2.d.ts.map +1 -1
- package/code-generator2.js +56 -29
- package/code-generator2.js.map +1 -1
- package/describe-query.d.ts.map +1 -1
- package/describe-query.js +8 -2
- package/describe-query.js.map +1 -1
- package/dialects/postgres.d.ts.map +1 -1
- package/dialects/postgres.js +40 -2
- package/dialects/postgres.js.map +1 -1
- package/drivers/postgres.d.ts.map +1 -1
- package/drivers/postgres.js +14 -4
- package/drivers/postgres.js.map +1 -1
- package/drivers/types.d.ts +1 -0
- package/drivers/types.d.ts.map +1 -1
- package/mysql-mapping.d.ts +1 -1
- package/mysql-mapping.d.ts.map +1 -1
- package/mysql-mapping.js.map +1 -1
- package/package.json +52 -52
- package/postgres-query-analyzer/describe.d.ts.map +1 -1
- package/postgres-query-analyzer/describe.js +10 -41
- package/postgres-query-analyzer/describe.js.map +1 -1
- package/postgres-query-analyzer/parser.d.ts +2 -0
- package/postgres-query-analyzer/parser.d.ts.map +1 -1
- package/postgres-query-analyzer/parser.js +12 -0
- package/postgres-query-analyzer/parser.js.map +1 -1
- package/postgres-query-analyzer/traverse.d.ts +2 -0
- package/postgres-query-analyzer/traverse.d.ts.map +1 -1
- package/postgres-query-analyzer/traverse.js +339 -69
- package/postgres-query-analyzer/traverse.js.map +1 -1
- package/sqlite-query-analyzer/code-generator.js +4 -2
- package/sqlite-query-analyzer/code-generator.js.map +1 -1
- package/sqlite-query-analyzer/replace-list-params.js +31 -7
- package/sqlite-query-analyzer/replace-list-params.js.map +1 -1
- package/sqlite-query-analyzer/traverse.d.ts +2 -2
- package/sqlite-query-analyzer/traverse.d.ts.map +1 -1
- package/sqlite-query-analyzer/traverse.js +55 -21
- package/sqlite-query-analyzer/traverse.js.map +1 -1
- package/sqlite-query-analyzer/types.d.ts +1 -1
- package/sqlite-query-analyzer/types.d.ts.map +1 -1
- package/types.d.ts +1 -0
- package/types.d.ts.map +1 -1
package/drivers/postgres.js
CHANGED
|
@@ -23,12 +23,18 @@ const Either_1 = require("fp-ts/lib/Either");
|
|
|
23
23
|
const neverthrow_1 = require("neverthrow");
|
|
24
24
|
function loadDbSchema(sql) {
|
|
25
25
|
return neverthrow_1.ResultAsync.fromThrowable(() => __awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
const result = yield sql `
|
|
26
|
+
const result = yield sql `
|
|
27
|
+
SELECT
|
|
27
28
|
c.oid,
|
|
28
29
|
t.table_schema,
|
|
29
30
|
t.table_name,
|
|
30
31
|
col.column_name,
|
|
31
|
-
col.is_nullable
|
|
32
|
+
col.is_nullable,
|
|
33
|
+
CASE
|
|
34
|
+
WHEN con.contype = 'p' THEN 'PRI' -- Primary key
|
|
35
|
+
WHEN con.contype = 'u' THEN 'UNI' -- Unique constraint
|
|
36
|
+
ELSE '' -- Otherwise, empty string
|
|
37
|
+
END AS column_key
|
|
32
38
|
FROM
|
|
33
39
|
information_schema.tables t
|
|
34
40
|
JOIN
|
|
@@ -37,17 +43,21 @@ function loadDbSchema(sql) {
|
|
|
37
43
|
information_schema.columns col
|
|
38
44
|
ON t.table_name = col.table_name
|
|
39
45
|
AND t.table_schema = col.table_schema
|
|
46
|
+
LEFT JOIN
|
|
47
|
+
pg_constraint con ON con.conrelid = c.oid
|
|
48
|
+
AND col.ordinal_position = ANY (con.conkey)
|
|
40
49
|
WHERE
|
|
41
50
|
t.table_type = 'BASE TABLE' -- Only regular tables, excluding views
|
|
42
51
|
AND t.table_schema NOT IN ('information_schema', 'pg_catalog') -- Exclude system schemas
|
|
43
52
|
ORDER BY
|
|
44
|
-
t.table_schema, t.table_name, col.ordinal_position
|
|
53
|
+
t.table_schema, t.table_name, col.ordinal_position`;
|
|
45
54
|
return result.map((row) => ({
|
|
46
55
|
oid: row.oid,
|
|
47
56
|
table_schema: row.table_schema,
|
|
48
57
|
table_name: row.table_name,
|
|
49
58
|
column_name: row.column_name,
|
|
50
|
-
is_nullable: row.is_nullable === 'YES'
|
|
59
|
+
is_nullable: row.is_nullable === 'YES',
|
|
60
|
+
column_key: row.column_key
|
|
51
61
|
}));
|
|
52
62
|
}), (reason) => {
|
|
53
63
|
if (reason.errors && reason.errors.length > 0) {
|
package/drivers/postgres.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAOA,
|
|
1
|
+
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":"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"}
|
package/drivers/types.d.ts
CHANGED
package/drivers/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/drivers/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,MAAM,oBAAoB,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/drivers/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,MAAM,oBAAoB,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,KAAK,GAAG,KAAK,GAAG,EAAE,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAEf,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC9B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAC/B,CAAA;AACD,MAAM,MAAM,mBAAmB,GAAG,gBAAgB,GAAG;IACpD,kBAAkB,EAAE,OAAO,CAAC;CAC5B,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAEpD,MAAM,MAAM,MAAM,CAAC,UAAU,IAAI;IAChC,YAAY,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,UAAU,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;CAC/E,CAAA"}
|
package/mysql-mapping.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ export declare enum FlagEnum {
|
|
|
9
9
|
export type InferType = MySqlType | SQLiteType | PostgresType | '?' | 'number' | 'any';
|
|
10
10
|
export type DbType = MySqlType | SQLiteType | PostgresType;
|
|
11
11
|
export type MySqlType = 'decimal' | 'decimal[]' | 'tinyint' | 'tinyint[]' | 'smallint' | 'smallint[]' | 'int' | 'int[]' | 'float' | 'float[]' | 'double' | 'double[]' | 'null' | 'timestamp' | 'bigint' | 'bigint[]' | 'mediumint' | 'mediumint[]' | 'date' | 'time' | 'datetime' | 'year' | 'year[]' | 'newdate' | 'varchar' | 'varchar[]' | 'bit' | 'bit[]' | 'timestamp2' | 'datetime2' | 'time2' | 'json' | `enum(${string})` | 'set' | 'tinyblob' | 'mediumblob' | 'longblob' | 'blob' | 'tinytext' | 'mediumtext' | 'longtext' | 'text' | 'varbinary' | 'binary' | 'char' | 'char[]' | 'geometry';
|
|
12
|
-
export type TsType = 'string' | 'string[]' | 'number' | 'number[]' | 'boolean' | 'boolean[]' | 'Date' | 'Date[]' | 'Object' | 'Object[]' | 'Uint8Array' | 'ArrayBuffer' | 'any' | 'null';
|
|
12
|
+
export type TsType = 'string' | 'string[]' | 'number' | 'number[]' | 'boolean' | 'boolean[]' | 'Date' | 'Date[]' | 'Object' | 'Object[]' | 'Uint8Array' | 'ArrayBuffer' | 'ArrayBuffer[]' | 'any' | 'null';
|
|
13
13
|
export declare function converToTsType(mySqlType: MySqlType | 'any'): TsType;
|
|
14
14
|
export declare function checkFlag(flags: number, flag: FlagEnum): boolean;
|
|
15
15
|
export declare function convertTypeCodeToMysqlType(typeCode: number, flags: FlagEnum, columnLength: number): MySqlType | string;
|
package/mysql-mapping.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-mapping.d.ts","sourceRoot":"","sources":["../../src/mysql-mapping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE9E,oBAAY,QAAQ;IACnB,QAAQ,IAAI;IACZ,OAAO,IAAI;IACX,WAAW,MAAM;IACjB,SAAS,MAAM;IACf,QAAQ,OAAO;CACf;AAED,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,UAAU,GAAG,YAAY,GAAG,GAAG,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEvF,MAAM,MAAM,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,YAAY,CAAC;AAE3D,MAAM,MAAM,SAAS,GAClB,SAAS,GACT,WAAW,GACX,SAAS,GACT,WAAW,GACX,UAAU,GACV,YAAY,GACZ,KAAK,GACL,OAAO,GACP,OAAO,GACP,SAAS,GACT,QAAQ,GACR,UAAU,GACV,MAAM,GACN,WAAW,GACX,QAAQ,GACR,UAAU,GACV,WAAW,GACX,aAAa,GACb,MAAM,GACN,MAAM,GACN,UAAU,GACV,MAAM,GACN,QAAQ,GACR,SAAS,GACT,SAAS,GACT,WAAW,GACX,KAAK,GACL,OAAO,GACP,YAAY,GACZ,WAAW,GACX,OAAO,GACP,MAAM,GACN,QAAQ,MAAM,GAAG,GACjB,KAAK,GACL,UAAU,GACV,YAAY,GACZ,UAAU,GACV,MAAM,GACN,UAAU,GACV,YAAY,GACZ,UAAU,GACV,MAAM,GACN,WAAW,GACX,QAAQ,GACR,MAAM,GACN,QAAQ,GACR,UAAU,CAAC;AAEd,MAAM,MAAM,MAAM,GACf,QAAQ,GACR,UAAU,GACV,QAAQ,GACR,UAAU,GACV,SAAS,GACT,WAAW,GACX,MAAM,GACN,QAAQ,GACR,QAAQ,GACR,UAAU,GACV,YAAY,GACZ,aAAa,GACb,KAAK,GACL,MAAM,CAAC;AAEV,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,KAAK,GAAG,MAAM,CAsEnE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,WAEtD;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CA4BtH;AAED,KAAK,aAAa,GAAG;IACpB,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,aAgC1B,CAAC"}
|
|
1
|
+
{"version":3,"file":"mysql-mapping.d.ts","sourceRoot":"","sources":["../../src/mysql-mapping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE9E,oBAAY,QAAQ;IACnB,QAAQ,IAAI;IACZ,OAAO,IAAI;IACX,WAAW,MAAM;IACjB,SAAS,MAAM;IACf,QAAQ,OAAO;CACf;AAED,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,UAAU,GAAG,YAAY,GAAG,GAAG,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEvF,MAAM,MAAM,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,YAAY,CAAC;AAE3D,MAAM,MAAM,SAAS,GAClB,SAAS,GACT,WAAW,GACX,SAAS,GACT,WAAW,GACX,UAAU,GACV,YAAY,GACZ,KAAK,GACL,OAAO,GACP,OAAO,GACP,SAAS,GACT,QAAQ,GACR,UAAU,GACV,MAAM,GACN,WAAW,GACX,QAAQ,GACR,UAAU,GACV,WAAW,GACX,aAAa,GACb,MAAM,GACN,MAAM,GACN,UAAU,GACV,MAAM,GACN,QAAQ,GACR,SAAS,GACT,SAAS,GACT,WAAW,GACX,KAAK,GACL,OAAO,GACP,YAAY,GACZ,WAAW,GACX,OAAO,GACP,MAAM,GACN,QAAQ,MAAM,GAAG,GACjB,KAAK,GACL,UAAU,GACV,YAAY,GACZ,UAAU,GACV,MAAM,GACN,UAAU,GACV,YAAY,GACZ,UAAU,GACV,MAAM,GACN,WAAW,GACX,QAAQ,GACR,MAAM,GACN,QAAQ,GACR,UAAU,CAAC;AAEd,MAAM,MAAM,MAAM,GACf,QAAQ,GACR,UAAU,GACV,QAAQ,GACR,UAAU,GACV,SAAS,GACT,WAAW,GACX,MAAM,GACN,QAAQ,GACR,QAAQ,GACR,UAAU,GACV,YAAY,GACZ,aAAa,GACb,eAAe,GACf,KAAK,GACL,MAAM,CAAC;AAEV,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,KAAK,GAAG,MAAM,CAsEnE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,WAEtD;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CA4BtH;AAED,KAAK,aAAa,GAAG;IACpB,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,aAgC1B,CAAC"}
|
package/mysql-mapping.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-mapping.js","sourceRoot":"","sources":["../../src/mysql-mapping.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"mysql-mapping.js","sourceRoot":"","sources":["../../src/mysql-mapping.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,52 +1,52 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "typesql-cli",
|
|
3
|
-
"version": "0.15.0
|
|
4
|
-
"description": "",
|
|
5
|
-
"main": "index.js",
|
|
6
|
-
"bin": {
|
|
7
|
-
"typesql": "cli.js"
|
|
8
|
-
},
|
|
9
|
-
"scripts": {
|
|
10
|
-
"build": "tsc -w",
|
|
11
|
-
"test": "mocha --enable-source-maps dist/tests/**/*.js --watch --watch-files **/*.js",
|
|
12
|
-
"antlr4ts": "antlr4ts -Xexact-output-dir -o ./parser/ ./grammar/*.g4",
|
|
13
|
-
"dist": "tsc && shx cp ./package.json ./README.md ./dist/src && cd ./dist/src && npm publish",
|
|
14
|
-
"dist-exp": "tsc && shx cp ./package.json ./README.md ./dist/src && cd ./dist/src && npm publish --tag experimental",
|
|
15
|
-
"gen": "node ./dist/src/cli.js compile"
|
|
16
|
-
},
|
|
17
|
-
"keywords": [],
|
|
18
|
-
"author": "",
|
|
19
|
-
"license": "MIT",
|
|
20
|
-
"publishConfig": {
|
|
21
|
-
"access": "public"
|
|
22
|
-
},
|
|
23
|
-
"devDependencies": {
|
|
24
|
-
"@biomejs/biome": "^1.8.3",
|
|
25
|
-
"@cloudflare/workers-types": "^4.20241022.0",
|
|
26
|
-
"@types/better-sqlite3": "^7.6.11",
|
|
27
|
-
"@types/camelcase": "^5.2.0",
|
|
28
|
-
"@types/mocha": "^10.0.7",
|
|
29
|
-
"@types/node": "^20.14.10",
|
|
30
|
-
"@types/yargs": "^17.0.32",
|
|
31
|
-
"mocha": "^10.6.0",
|
|
32
|
-
"prettier": "3.3.3",
|
|
33
|
-
"shx": "^0.3.4",
|
|
34
|
-
"ts-node": "^10.9.2",
|
|
35
|
-
"typescript": "^5.5.3"
|
|
36
|
-
},
|
|
37
|
-
"dependencies": {
|
|
38
|
-
"@wsporto/typesql-parser": "^0.0.3",
|
|
39
|
-
"better-sqlite3": "^11.1.2",
|
|
40
|
-
"camelcase": "^6.3.0",
|
|
41
|
-
"chokidar": "^3.6.0",
|
|
42
|
-
"code-block-writer": "^13.0.1",
|
|
43
|
-
"fp-ts": "^2.16.8",
|
|
44
|
-
"glob": "^10.4.5",
|
|
45
|
-
"libsql": "^0.4.4",
|
|
46
|
-
"moment": "^2.30.1",
|
|
47
|
-
"mysql2": "^3.10.3",
|
|
48
|
-
"neverthrow": "^8.1.1",
|
|
49
|
-
"postgres": "^3.4.5",
|
|
50
|
-
"yargs": "^17.7.2"
|
|
51
|
-
}
|
|
52
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "typesql-cli",
|
|
3
|
+
"version": "0.15.0",
|
|
4
|
+
"description": "",
|
|
5
|
+
"main": "index.js",
|
|
6
|
+
"bin": {
|
|
7
|
+
"typesql": "cli.js"
|
|
8
|
+
},
|
|
9
|
+
"scripts": {
|
|
10
|
+
"build": "tsc -w",
|
|
11
|
+
"test": "mocha --enable-source-maps dist/tests/**/*.js --watch --watch-files **/*.js",
|
|
12
|
+
"antlr4ts": "antlr4ts -Xexact-output-dir -o ./parser/ ./grammar/*.g4",
|
|
13
|
+
"dist": "tsc && shx cp ./package.json ./README.md ./dist/src && cd ./dist/src && npm publish",
|
|
14
|
+
"dist-exp": "tsc && shx cp ./package.json ./README.md ./dist/src && cd ./dist/src && npm publish --tag experimental",
|
|
15
|
+
"gen": "node ./dist/src/cli.js compile"
|
|
16
|
+
},
|
|
17
|
+
"keywords": [],
|
|
18
|
+
"author": "",
|
|
19
|
+
"license": "MIT",
|
|
20
|
+
"publishConfig": {
|
|
21
|
+
"access": "public"
|
|
22
|
+
},
|
|
23
|
+
"devDependencies": {
|
|
24
|
+
"@biomejs/biome": "^1.8.3",
|
|
25
|
+
"@cloudflare/workers-types": "^4.20241022.0",
|
|
26
|
+
"@types/better-sqlite3": "^7.6.11",
|
|
27
|
+
"@types/camelcase": "^5.2.0",
|
|
28
|
+
"@types/mocha": "^10.0.7",
|
|
29
|
+
"@types/node": "^20.14.10",
|
|
30
|
+
"@types/yargs": "^17.0.32",
|
|
31
|
+
"mocha": "^10.6.0",
|
|
32
|
+
"prettier": "3.3.3",
|
|
33
|
+
"shx": "^0.3.4",
|
|
34
|
+
"ts-node": "^10.9.2",
|
|
35
|
+
"typescript": "^5.5.3"
|
|
36
|
+
},
|
|
37
|
+
"dependencies": {
|
|
38
|
+
"@wsporto/typesql-parser": "^0.0.3",
|
|
39
|
+
"better-sqlite3": "^11.1.2",
|
|
40
|
+
"camelcase": "^6.3.0",
|
|
41
|
+
"chokidar": "^3.6.0",
|
|
42
|
+
"code-block-writer": "^13.0.1",
|
|
43
|
+
"fp-ts": "^2.16.8",
|
|
44
|
+
"glob": "^10.4.5",
|
|
45
|
+
"libsql": "^0.4.4",
|
|
46
|
+
"moment": "^2.30.1",
|
|
47
|
+
"mysql2": "^3.10.3",
|
|
48
|
+
"neverthrow": "^8.1.1",
|
|
49
|
+
"postgres": "^3.4.5",
|
|
50
|
+
"yargs": "^17.7.2"
|
|
51
|
+
}
|
|
52
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"describe.d.ts","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/describe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGjE,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAI/B,OAAO,EAAc,WAAW,
|
|
1
|
+
{"version":3,"file":"describe.d.ts","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/describe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGjE,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAI/B,OAAO,EAAc,WAAW,EAAO,MAAM,YAAY,CAAC;AA4B1D,MAAM,MAAM,kBAAkB,GAAG;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB,CAAC;AAoBF,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,SAAS,EAAE,YAAY,CAAC,CAezH"}
|
|
@@ -6,13 +6,13 @@ const parser_1 = require("./parser");
|
|
|
6
6
|
const replace_list_params_1 = require("../sqlite-query-analyzer/replace-list-params");
|
|
7
7
|
const neverthrow_1 = require("neverthrow");
|
|
8
8
|
const postgres_2 = require("../dialects/postgres");
|
|
9
|
-
function describeQueryRefine(sql,
|
|
9
|
+
function describeQueryRefine(sql, postgresDescribeResult, traverseResult, namedParameters) {
|
|
10
10
|
const paramNames = postgresDescribeResult.parameters.map((_, index) => namedParameters[index] ? namedParameters[index] : `param${index + 1}`);
|
|
11
11
|
const newSql = (0, replace_list_params_1.replacePostgresParams)(sql, traverseResult.parameterList, paramNames);
|
|
12
12
|
const descResult = {
|
|
13
13
|
sql: newSql,
|
|
14
14
|
queryType: traverseResult.queryType,
|
|
15
|
-
multipleRowsResult:
|
|
15
|
+
multipleRowsResult: traverseResult.multipleRowsResult,
|
|
16
16
|
columns: getColumnsForQuery(traverseResult, postgresDescribeResult),
|
|
17
17
|
parameters: traverseResult.queryType === 'Update'
|
|
18
18
|
? getParamtersForWhere(traverseResult, postgresDescribeResult, paramNames)
|
|
@@ -21,6 +21,9 @@ function describeQueryRefine(sql, schema, postgresDescribeResult, traverseResult
|
|
|
21
21
|
if (traverseResult.queryType === 'Update') {
|
|
22
22
|
descResult.data = getDataForQuery(traverseResult, postgresDescribeResult, paramNames);
|
|
23
23
|
}
|
|
24
|
+
if (traverseResult.returning) {
|
|
25
|
+
descResult.returning = traverseResult.returning;
|
|
26
|
+
}
|
|
24
27
|
return (0, neverthrow_1.ok)(descResult);
|
|
25
28
|
}
|
|
26
29
|
function mapToColumnInfo(col, posgresTypes, notNull) {
|
|
@@ -43,10 +46,12 @@ function mapToParamDef(paramName, paramType, notNull, isList) {
|
|
|
43
46
|
function describeQuery(postgres, sql, namedParameters) {
|
|
44
47
|
return (0, postgres_1.loadDbSchema)(postgres)
|
|
45
48
|
.andThen(dbSchema => {
|
|
46
|
-
const parseResult = (0, parser_1.
|
|
49
|
+
const parseResult = (0, parser_1.safeParseSql)(sql, dbSchema);
|
|
50
|
+
if (parseResult.isErr()) {
|
|
51
|
+
return (0, neverthrow_1.err)(parseResult.error);
|
|
52
|
+
}
|
|
47
53
|
return (0, postgres_1.postgresDescribe)(postgres, sql)
|
|
48
|
-
.andThen(
|
|
49
|
-
.andThen(analyzeResult => describeQueryRefine(sql, dbSchema, analyzeResult, parseResult, namedParameters));
|
|
54
|
+
.andThen(analyzeResult => describeQueryRefine(sql, analyzeResult, parseResult.value, namedParameters));
|
|
50
55
|
}).mapErr(err => {
|
|
51
56
|
return {
|
|
52
57
|
name: 'error',
|
|
@@ -54,42 +59,6 @@ function describeQuery(postgres, sql, namedParameters) {
|
|
|
54
59
|
};
|
|
55
60
|
});
|
|
56
61
|
}
|
|
57
|
-
function getMultipleRowInfo(postgres, sql, describeResult, parseResult) {
|
|
58
|
-
if (parseResult.queryType === 'Select') {
|
|
59
|
-
if (parseResult.limit === 1) {
|
|
60
|
-
const result = Object.assign(Object.assign({}, describeResult), { multipleRowsResult: false });
|
|
61
|
-
return (0, neverthrow_1.okAsync)(result);
|
|
62
|
-
}
|
|
63
|
-
const newSql = (0, replace_list_params_1.replacePostgresParamsWithValues)(sql, parseResult.parameterList, describeResult.parameters);
|
|
64
|
-
return (0, postgres_1.postgresAnalyze)(postgres, newSql).map(analyzeResult => {
|
|
65
|
-
const singleRow = isSingleRow(analyzeResult);
|
|
66
|
-
const result = Object.assign(Object.assign({}, describeResult), { multipleRowsResult: !singleRow });
|
|
67
|
-
return result;
|
|
68
|
-
});
|
|
69
|
-
}
|
|
70
|
-
const result = Object.assign(Object.assign({}, describeResult), { multipleRowsResult: false });
|
|
71
|
-
return (0, neverthrow_1.okAsync)(result);
|
|
72
|
-
}
|
|
73
|
-
function isSingleRow(queryPlans) {
|
|
74
|
-
const first = parseSingleQueryPlan(queryPlans[0]);
|
|
75
|
-
const isAggregate = queryPlans[0].startsWith('Aggregate ') && first === 1;
|
|
76
|
-
if (isAggregate) {
|
|
77
|
-
return true;
|
|
78
|
-
}
|
|
79
|
-
const parseResult = queryPlans
|
|
80
|
-
.map(queryPlan => parseSingleQueryPlan(queryPlan))
|
|
81
|
-
.filter(rows => rows != null)
|
|
82
|
-
.every(value => value === 1);
|
|
83
|
-
return parseResult;
|
|
84
|
-
}
|
|
85
|
-
function parseSingleQueryPlan(queryPlan) {
|
|
86
|
-
const regex = /rows=(\d+)/;
|
|
87
|
-
const match = queryPlan.match(regex);
|
|
88
|
-
if (match) {
|
|
89
|
-
return parseInt(match[1], 10); // match[1] is the captured number after 'rows='
|
|
90
|
-
}
|
|
91
|
-
return null;
|
|
92
|
-
}
|
|
93
62
|
function getColumnsForQuery(traverseResult, postgresDescribeResult) {
|
|
94
63
|
return postgresDescribeResult.columns.map((col, index) => mapToColumnInfo(col, postgres_2.postgresTypes, traverseResult.columnsNullability[index]));
|
|
95
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"describe.js","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/describe.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"describe.js","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/describe.ts"],"names":[],"mappings":";;AAyDA,sCAeC;AAtED,kDAAqE;AAGrE,qCAAwC;AACxC,sFAAqF;AACrF,2CAA0D;AAC1D,mDAAqD;AAGrD,SAAS,mBAAmB,CAAC,GAAW,EAAE,sBAAwC,EAAE,cAAsC,EAAE,eAAyB;IAEpJ,MAAM,UAAU,GAAG,sBAAsB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC;IAE9I,MAAM,MAAM,GAAG,IAAA,2CAAqB,EAAC,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAEpF,MAAM,UAAU,GAAc;QAC7B,GAAG,EAAE,MAAM;QACX,SAAS,EAAE,cAAc,CAAC,SAAS;QACnC,kBAAkB,EAAE,cAAc,CAAC,kBAAkB;QACrD,OAAO,EAAE,kBAAkB,CAAC,cAAc,EAAE,sBAAsB,CAAC;QACnE,UAAU,EAAE,cAAc,CAAC,SAAS,KAAK,QAAQ;YAChD,CAAC,CAAC,oBAAoB,CAAC,cAAc,EAAE,sBAAsB,EAAE,UAAU,CAAC;YAC1E,CAAC,CAAC,oBAAoB,CAAC,cAAc,EAAE,sBAAsB,EAAE,UAAU,CAAC;KAC3E,CAAA;IACD,IAAI,cAAc,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;QAC3C,UAAU,CAAC,IAAI,GAAG,eAAe,CAAC,cAAc,EAAE,sBAAsB,EAAE,UAAU,CAAC,CAAC;IACvF,CAAC;IACD,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;QAC9B,UAAU,CAAC,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC;IACjD,CAAC;IACD,OAAO,IAAA,eAAE,EAAC,UAAU,CAAC,CAAC;AACvB,CAAC;AAMD,SAAS,eAAe,CAAC,GAAwB,EAAE,YAA0B,EAAE,OAAgB;;IAC9F,OAAO;QACN,UAAU,EAAE,GAAG,CAAC,IAAI;QACpB,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,MAAA,YAAY,CAAC,GAAG,CAAC,MAAM,CAAQ,mCAAI,GAAG;QAC5C,KAAK,EAAE,GAAG,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO;KACtC,CAAA;AACF,CAAC;AAED,SAAS,aAAa,CAAC,SAAiB,EAAE,SAAiB,EAAE,OAAgB,EAAE,MAAe;IAC7F,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAA;IACpC,OAAO;QACN,IAAI,EAAE,SAAS;QACf,OAAO;QACP,UAAU,EAAE,GAAG,wBAAa,CAAC,SAAS,CAAC,GAAG,SAAS,EAAS;KAC5D,CAAA;AACF,CAAC;AAED,SAAgB,aAAa,CAAC,QAAa,EAAE,GAAW,EAAE,eAAyB;IAClF,OAAO,IAAA,uBAAY,EAAC,QAAQ,CAAC;SAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE;QACnB,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAChD,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC;YACzB,OAAO,IAAA,gBAAG,EAAC,WAAW,CAAC,KAAK,CAAC,CAAA;QAC9B,CAAC;QACD,OAAO,IAAA,2BAAgB,EAAC,QAAQ,EAAE,GAAG,CAAC;aACpC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC;IACzG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;QACf,OAAO;YACN,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,GAAG;SAChB,CAAA;IACF,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,cAAsC,EAAE,sBAAwC;IAC3G,OAAO,sBAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,wBAAa,EAAE,cAAc,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AACzI,CAAC;AAED,SAAS,oBAAoB,CAAC,cAAsC,EAAE,sBAAwC,EAAE,UAAoB;IACnI,OAAO,sBAAsB,CAAC,UAAU;SACtC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,WAAC,OAAA,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAA,cAAc,CAAC,qBAAqB,CAAC,KAAK,CAAC,mCAAI,IAAI,EAAE,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA,EAAA,CAAC,CAAA;AAC3J,CAAC;AAED,SAAS,oBAAoB,CAAC,cAAsC,EAAE,sBAAwC,EAAE,UAAoB;IACnI,MAAM,WAAW,GAAG,cAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC;IAChE,OAAO,sBAAsB,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC;SACzD,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,eAAC,OAAA,aAAa,CAAC,UAAU,CAAC,KAAK,GAAG,WAAW,CAAC,EAAE,KAAK,EAAE,MAAA,MAAA,cAAc,CAAC,yBAAyB,0CAAG,KAAK,CAAC,mCAAI,IAAI,EAAE,cAAc,CAAC,aAAa,CAAC,KAAK,GAAG,WAAW,CAAC,CAAC,CAAA,EAAA,CAAC,CAAA;AAC7L,CAAC;AAED,SAAS,eAAe,CAAC,cAAsC,EAAE,sBAAwC,EAAE,UAAoB;IAC9H,OAAO,sBAAsB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC;SAC5F,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,WAAC,OAAA,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAA,cAAc,CAAC,qBAAqB,CAAC,KAAK,CAAC,mCAAI,IAAI,EAAE,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA,EAAA,CAAC,CAAA;AAC3J,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { PostgresTraverseResult } from './traverse';
|
|
2
2
|
import { PostgresColumnSchema } from '../drivers/types';
|
|
3
|
+
import { Result } from 'neverthrow';
|
|
3
4
|
export declare function parseSql(sql: string, dbSchema: PostgresColumnSchema[]): PostgresTraverseResult;
|
|
5
|
+
export declare function safeParseSql(sql: string, dbSchema: PostgresColumnSchema[]): Result<PostgresTraverseResult, string>;
|
|
4
6
|
//# sourceMappingURL=parser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAe,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAe,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAG7C,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,GAAG,sBAAsB,CAM9F;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,sBAAsB,EAAE,MAAM,CAAC,CASlH"}
|
|
@@ -1,11 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseSql = parseSql;
|
|
4
|
+
exports.safeParseSql = safeParseSql;
|
|
4
5
|
const postgres_1 = require("@wsporto/typesql-parser/postgres");
|
|
5
6
|
const traverse_1 = require("./traverse");
|
|
7
|
+
const neverthrow_1 = require("neverthrow");
|
|
6
8
|
function parseSql(sql, dbSchema) {
|
|
7
9
|
const parser = (0, postgres_1.parseSql)(sql);
|
|
8
10
|
const traverseResult = (0, traverse_1.traverseSmt)(parser.stmt(), dbSchema);
|
|
9
11
|
return traverseResult;
|
|
10
12
|
}
|
|
13
|
+
function safeParseSql(sql, dbSchema) {
|
|
14
|
+
try {
|
|
15
|
+
const result = parseSql(sql, dbSchema);
|
|
16
|
+
return (0, neverthrow_1.ok)(result);
|
|
17
|
+
}
|
|
18
|
+
catch (e) {
|
|
19
|
+
const error = e;
|
|
20
|
+
return (0, neverthrow_1.err)(error.message);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
11
23
|
//# sourceMappingURL=parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/parser.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/parser.ts"],"names":[],"mappings":";;AAMA,4BAMC;AAED,oCASC;AAvBD,+DAAyE;AACzE,yCAAiE;AAEjE,2CAA6C;AAG7C,SAAgB,QAAQ,CAAC,GAAW,EAAE,QAAgC;IACrE,MAAM,MAAM,GAAG,IAAA,mBAAS,EAAC,GAAG,CAAC,CAAC;IAE9B,MAAM,cAAc,GAAG,IAAA,sBAAW,EAAC,MAAM,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;IAE5D,OAAO,cAAc,CAAC;AACvB,CAAC;AAED,SAAgB,YAAY,CAAC,GAAW,EAAE,QAAgC;IACzE,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvC,OAAO,IAAA,eAAE,EAAC,MAAM,CAAC,CAAC;IACnB,CAAC;IACD,OAAO,CAAC,EAAE,CAAC;QACV,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,OAAO,IAAA,gBAAG,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;AACF,CAAC"}
|
|
@@ -3,11 +3,13 @@ import { PostgresColumnSchema } from '../drivers/types';
|
|
|
3
3
|
import { QueryType } from '../types';
|
|
4
4
|
export type PostgresTraverseResult = {
|
|
5
5
|
queryType: QueryType;
|
|
6
|
+
multipleRowsResult: boolean;
|
|
6
7
|
columnsNullability: boolean[];
|
|
7
8
|
parametersNullability: boolean[];
|
|
8
9
|
whereParamtersNullability?: boolean[];
|
|
9
10
|
parameterList: boolean[];
|
|
10
11
|
limit?: number;
|
|
12
|
+
returning?: boolean;
|
|
11
13
|
};
|
|
12
14
|
export declare function traverseSmt(stmt: StmtContext, dbSchema: PostgresColumnSchema[]): PostgresTraverseResult;
|
|
13
15
|
//# sourceMappingURL=traverse.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traverse.d.ts","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/traverse.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"traverse.d.ts","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/traverse.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4mC,WAAW,EAA4L,MAAM,mDAAmD,CAAC;AAEp3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGxD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAcrC,MAAM,MAAM,sBAAsB,GAAG;IACpC,SAAS,EAAE,SAAS,CAAC;IACrB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,kBAAkB,EAAE,OAAO,EAAE,CAAC;IAC9B,qBAAqB,EAAE,OAAO,EAAE,CAAC;IACjC,yBAAyB,CAAC,EAAE,OAAO,EAAE,CAAC;IACtC,aAAa,EAAE,OAAO,EAAE,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;CACpB,CAAA;AAaD,wBAAgB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,oBAAoB,EAAE,GAAG,sBAAsB,CAwBvG"}
|