typesql-cli 0.15.1 → 0.15.3
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 +1 -1
- package/code-generator.d.ts +1 -1
- package/code-generator.d.ts.map +1 -1
- package/code-generator.js +2 -2
- package/code-generator.js.map +1 -1
- package/code-generator2.d.ts.map +1 -1
- package/code-generator2.js +354 -26
- package/code-generator2.js.map +1 -1
- package/drivers/postgres.d.ts +1 -3
- package/drivers/postgres.d.ts.map +1 -1
- package/drivers/postgres.js +0 -10
- package/drivers/postgres.js.map +1 -1
- package/drivers/sqlite.d.ts +5 -0
- package/drivers/sqlite.d.ts.map +1 -0
- package/drivers/sqlite.js +37 -0
- package/drivers/sqlite.js.map +1 -0
- package/package.json +5 -2
- package/postgres-query-analyzer/describe.d.ts.map +1 -1
- package/postgres-query-analyzer/describe.js +35 -10
- package/postgres-query-analyzer/describe.js.map +1 -1
- package/postgres-query-analyzer/parser.d.ts +2 -2
- package/postgres-query-analyzer/parser.d.ts.map +1 -1
- package/postgres-query-analyzer/parser.js +4 -4
- package/postgres-query-analyzer/parser.js.map +1 -1
- package/postgres-query-analyzer/traverse.d.ts +23 -2
- package/postgres-query-analyzer/traverse.d.ts.map +1 -1
- package/postgres-query-analyzer/traverse.js +509 -204
- package/postgres-query-analyzer/traverse.js.map +1 -1
- package/sqlite-query-analyzer/code-generator.d.ts +9 -2
- package/sqlite-query-analyzer/code-generator.d.ts.map +1 -1
- package/sqlite-query-analyzer/code-generator.js +13 -38
- package/sqlite-query-analyzer/code-generator.js.map +1 -1
- package/sqlite-query-analyzer/sqlite-describe-nested-query.d.ts +2 -0
- package/sqlite-query-analyzer/sqlite-describe-nested-query.d.ts.map +1 -1
- package/sqlite-query-analyzer/sqlite-describe-nested-query.js +12 -7
- package/sqlite-query-analyzer/sqlite-describe-nested-query.js.map +1 -1
- package/sqlite-query-analyzer/traverse.d.ts +5 -1
- package/sqlite-query-analyzer/traverse.d.ts.map +1 -1
- package/sqlite-query-analyzer/traverse.js +11 -2
- package/sqlite-query-analyzer/traverse.js.map +1 -1
- package/ts-nested-descriptor.js +1 -1
- package/ts-nested-descriptor.js.map +1 -1
package/drivers/postgres.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { TsType } from '../mysql-mapping';
|
|
2
|
+
import { SQLiteType } from '../sqlite-query-analyzer/types';
|
|
3
|
+
import { SQLiteClient } from '../types';
|
|
4
|
+
export declare function mapColumnType(sqliteType: SQLiteType, client: SQLiteClient): TsType;
|
|
5
|
+
//# sourceMappingURL=sqlite.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../../src/drivers/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,wBAAgB,aAAa,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,GAAG,MAAM,CAgClF"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.mapColumnType = mapColumnType;
|
|
4
|
+
function mapColumnType(sqliteType, client) {
|
|
5
|
+
switch (sqliteType) {
|
|
6
|
+
case 'INTEGER':
|
|
7
|
+
return 'number';
|
|
8
|
+
case 'INTEGER[]':
|
|
9
|
+
return 'number[]';
|
|
10
|
+
case 'TEXT':
|
|
11
|
+
return 'string';
|
|
12
|
+
case 'TEXT[]':
|
|
13
|
+
return 'string[]';
|
|
14
|
+
case 'NUMERIC':
|
|
15
|
+
return 'number';
|
|
16
|
+
case 'NUMERIC[]':
|
|
17
|
+
return 'number[]';
|
|
18
|
+
case 'REAL':
|
|
19
|
+
return 'number';
|
|
20
|
+
case 'REAL[]':
|
|
21
|
+
return 'number[]';
|
|
22
|
+
case 'DATE':
|
|
23
|
+
return 'Date';
|
|
24
|
+
case 'DATE_TIME':
|
|
25
|
+
return 'Date';
|
|
26
|
+
case 'BLOB':
|
|
27
|
+
return client === 'better-sqlite3' ? 'Uint8Array' : 'ArrayBuffer';
|
|
28
|
+
case 'BOOLEAN':
|
|
29
|
+
return 'boolean';
|
|
30
|
+
}
|
|
31
|
+
if (sqliteType.startsWith('ENUM')) {
|
|
32
|
+
const enumValues = sqliteType.substring(sqliteType.indexOf('(') + 1, sqliteType.indexOf(')'));
|
|
33
|
+
return enumValues.split(',').join(' | ');
|
|
34
|
+
}
|
|
35
|
+
return 'any';
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=sqlite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sqlite.js","sourceRoot":"","sources":["../../../src/drivers/sqlite.ts"],"names":[],"mappings":";;AAIA,sCAgCC;AAhCD,SAAgB,aAAa,CAAC,UAAsB,EAAE,MAAoB;IACzE,QAAQ,UAAU,EAAE,CAAC;QACpB,KAAK,SAAS;YACb,OAAO,QAAQ,CAAC;QACjB,KAAK,WAAW;YACf,OAAO,UAAU,CAAC;QACnB,KAAK,MAAM;YACV,OAAO,QAAQ,CAAC;QACjB,KAAK,QAAQ;YACZ,OAAO,UAAU,CAAC;QACnB,KAAK,SAAS;YACb,OAAO,QAAQ,CAAC;QACjB,KAAK,WAAW;YACf,OAAO,UAAU,CAAC;QACnB,KAAK,MAAM;YACV,OAAO,QAAQ,CAAC;QACjB,KAAK,QAAQ;YACZ,OAAO,UAAU,CAAC;QACnB,KAAK,MAAM;YACV,OAAO,MAAM,CAAC;QACf,KAAK,WAAW;YACf,OAAO,MAAM,CAAC;QACf,KAAK,MAAM;YACV,OAAO,MAAM,KAAK,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC;QACnE,KAAK,SAAS;YACb,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9F,OAAO,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAW,CAAC;IACpD,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "typesql-cli",
|
|
3
|
-
"version": "0.15.
|
|
3
|
+
"version": "0.15.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"bin": {
|
|
@@ -12,7 +12,8 @@
|
|
|
12
12
|
"antlr4ts": "antlr4ts -Xexact-output-dir -o ./parser/ ./grammar/*.g4",
|
|
13
13
|
"dist": "tsc && shx cp ./package.json ./README.md ./dist/src && cd ./dist/src && npm publish",
|
|
14
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"
|
|
15
|
+
"gen": "node ./dist/src/cli.js compile",
|
|
16
|
+
"gen-pg": "node ./dist/src/cli.js --config ./tests/postgres-e2e/typesql.json compile"
|
|
16
17
|
},
|
|
17
18
|
"keywords": [],
|
|
18
19
|
"author": "",
|
|
@@ -27,8 +28,10 @@
|
|
|
27
28
|
"@types/lodash.uniqby": "^4.7.9",
|
|
28
29
|
"@types/mocha": "^10.0.10",
|
|
29
30
|
"@types/node": "^20.17.10",
|
|
31
|
+
"@types/pg": "^8.11.10",
|
|
30
32
|
"@types/yargs": "^17.0.33",
|
|
31
33
|
"mocha": "^10.8.2",
|
|
34
|
+
"pg": "^8.13.1",
|
|
32
35
|
"prettier": "^3.4.2",
|
|
33
36
|
"shx": "^0.3.4",
|
|
34
37
|
"ts-node": "^10.9.2",
|
|
@@ -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,EAAO,MAAM,YAAY,CAAC;
|
|
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;AA6D1D,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,CAWzH"}
|
|
@@ -6,7 +6,18 @@ 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
|
-
|
|
9
|
+
const sqlite_describe_nested_query_1 = require("../sqlite-query-analyzer/sqlite-describe-nested-query");
|
|
10
|
+
const Either_1 = require("fp-ts/lib/Either");
|
|
11
|
+
const describe_query_1 = require("../describe-query");
|
|
12
|
+
const describe_dynamic_query_1 = require("../describe-dynamic-query");
|
|
13
|
+
function describeQueryRefine(sql, postgresDescribeResult, dbSchema, namedParameters) {
|
|
14
|
+
const generateNestedInfo = (0, describe_query_1.hasAnnotation)(sql, '@nested');
|
|
15
|
+
const generateDynamicQueryInfo = (0, describe_query_1.hasAnnotation)(sql, '@dynamicQuery');
|
|
16
|
+
const parseResult = (0, parser_1.safeParseSql)(sql, dbSchema, { collectNestedInfo: generateNestedInfo, collectDynamicQueryInfo: generateDynamicQueryInfo });
|
|
17
|
+
if (parseResult.isErr()) {
|
|
18
|
+
return (0, neverthrow_1.err)(parseResult.error);
|
|
19
|
+
}
|
|
20
|
+
const traverseResult = parseResult.value;
|
|
10
21
|
const paramNames = postgresDescribeResult.parameters.map((_, index) => namedParameters[index] ? namedParameters[index] : `param${index + 1}`);
|
|
11
22
|
const newSql = (0, replace_list_params_1.replacePostgresParams)(sql, traverseResult.parameterList, paramNames);
|
|
12
23
|
const descResult = {
|
|
@@ -24,15 +35,33 @@ function describeQueryRefine(sql, postgresDescribeResult, traverseResult, namedP
|
|
|
24
35
|
if (traverseResult.returning) {
|
|
25
36
|
descResult.returning = traverseResult.returning;
|
|
26
37
|
}
|
|
38
|
+
if (traverseResult.relations) {
|
|
39
|
+
const nestedResult = (0, sqlite_describe_nested_query_1.describeNestedQuery)(descResult.columns, traverseResult.relations || []);
|
|
40
|
+
if ((0, Either_1.isLeft)(nestedResult)) {
|
|
41
|
+
return (0, neverthrow_1.err)('Error during nested query result: ' + nestedResult.left.description);
|
|
42
|
+
}
|
|
43
|
+
descResult.nestedInfo = nestedResult.right;
|
|
44
|
+
}
|
|
45
|
+
if (traverseResult.dynamicQueryInfo) {
|
|
46
|
+
const dynamicSqlQueryInfo = (0, describe_dynamic_query_1.describeDynamicQuery2)(traverseResult.dynamicQueryInfo, namedParameters, []);
|
|
47
|
+
descResult.dynamicSqlQuery2 = dynamicSqlQueryInfo;
|
|
48
|
+
}
|
|
27
49
|
return (0, neverthrow_1.ok)(descResult);
|
|
28
50
|
}
|
|
29
|
-
function
|
|
51
|
+
function transformToMap(dbSchema) {
|
|
52
|
+
const hash = dbSchema.reduce((acc, { oid, table_name }) => {
|
|
53
|
+
acc[oid] = table_name;
|
|
54
|
+
return acc;
|
|
55
|
+
}, {});
|
|
56
|
+
return hash;
|
|
57
|
+
}
|
|
58
|
+
function mapToColumnInfo(col, posgresTypes, colInfo) {
|
|
30
59
|
var _a;
|
|
31
60
|
return {
|
|
32
61
|
columnName: col.name,
|
|
33
|
-
notNull:
|
|
62
|
+
notNull: !colInfo.is_nullable,
|
|
34
63
|
type: (_a = posgresTypes[col.typeId]) !== null && _a !== void 0 ? _a : '?',
|
|
35
|
-
table:
|
|
64
|
+
table: colInfo.table_name
|
|
36
65
|
};
|
|
37
66
|
}
|
|
38
67
|
function mapToParamDef(paramName, paramType, notNull, isList) {
|
|
@@ -46,12 +75,8 @@ function mapToParamDef(paramName, paramType, notNull, isList) {
|
|
|
46
75
|
function describeQuery(postgres, sql, namedParameters) {
|
|
47
76
|
return (0, postgres_1.loadDbSchema)(postgres)
|
|
48
77
|
.andThen(dbSchema => {
|
|
49
|
-
const parseResult = (0, parser_1.safeParseSql)(sql, dbSchema);
|
|
50
|
-
if (parseResult.isErr()) {
|
|
51
|
-
return (0, neverthrow_1.err)(parseResult.error);
|
|
52
|
-
}
|
|
53
78
|
return (0, postgres_1.postgresDescribe)(postgres, sql)
|
|
54
|
-
.andThen(analyzeResult => describeQueryRefine(sql, analyzeResult,
|
|
79
|
+
.andThen(analyzeResult => describeQueryRefine(sql, analyzeResult, dbSchema, namedParameters));
|
|
55
80
|
}).mapErr(err => {
|
|
56
81
|
return {
|
|
57
82
|
name: 'error',
|
|
@@ -60,7 +85,7 @@ function describeQuery(postgres, sql, namedParameters) {
|
|
|
60
85
|
});
|
|
61
86
|
}
|
|
62
87
|
function getColumnsForQuery(traverseResult, postgresDescribeResult) {
|
|
63
|
-
return postgresDescribeResult.columns.map((col, index) => mapToColumnInfo(col, postgres_2.postgresTypes, traverseResult.
|
|
88
|
+
return postgresDescribeResult.columns.map((col, index) => mapToColumnInfo(col, postgres_2.postgresTypes, traverseResult.columns[index]));
|
|
64
89
|
}
|
|
65
90
|
function getParamtersForQuery(traverseResult, postgresDescribeResult, paramNames) {
|
|
66
91
|
return postgresDescribeResult.parameters
|
|
@@ -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":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PostgresTraverseResult } from './traverse';
|
|
2
2
|
import { PostgresColumnSchema } from '../drivers/types';
|
|
3
3
|
import { Result } from 'neverthrow';
|
|
4
|
-
export declare function parseSql(sql: string, dbSchema: PostgresColumnSchema[]): PostgresTraverseResult;
|
|
5
|
-
export declare function safeParseSql(sql: string, dbSchema: PostgresColumnSchema[]): Result<PostgresTraverseResult, string>;
|
|
4
|
+
export declare function parseSql(sql: string, dbSchema: PostgresColumnSchema[], options?: import("./traverse").TraverseOptions): PostgresTraverseResult;
|
|
5
|
+
export declare function safeParseSql(sql: string, dbSchema: PostgresColumnSchema[], options?: import("./traverse").TraverseOptions): Result<PostgresTraverseResult, string>;
|
|
6
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,
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,sBAAsB,EAAe,MAAM,YAAY,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAE7C,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,EAAE,OAAO,uCAAmB,GAAG,sBAAsB,CAM1H;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,EAAE,OAAO,uCAAmB,GAAG,MAAM,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAS9I"}
|
|
@@ -5,14 +5,14 @@ exports.safeParseSql = safeParseSql;
|
|
|
5
5
|
const postgres_1 = require("@wsporto/typesql-parser/postgres");
|
|
6
6
|
const traverse_1 = require("./traverse");
|
|
7
7
|
const neverthrow_1 = require("neverthrow");
|
|
8
|
-
function parseSql(sql, dbSchema) {
|
|
8
|
+
function parseSql(sql, dbSchema, options = (0, traverse_1.defaultOptions)()) {
|
|
9
9
|
const parser = (0, postgres_1.parseSql)(sql);
|
|
10
|
-
const traverseResult = (0, traverse_1.traverseSmt)(parser.stmt(), dbSchema);
|
|
10
|
+
const traverseResult = (0, traverse_1.traverseSmt)(parser.stmt(), dbSchema, options);
|
|
11
11
|
return traverseResult;
|
|
12
12
|
}
|
|
13
|
-
function safeParseSql(sql, dbSchema) {
|
|
13
|
+
function safeParseSql(sql, dbSchema, options = (0, traverse_1.defaultOptions)()) {
|
|
14
14
|
try {
|
|
15
|
-
const result = parseSql(sql, dbSchema);
|
|
15
|
+
const result = parseSql(sql, dbSchema, options);
|
|
16
16
|
return (0, neverthrow_1.ok)(result);
|
|
17
17
|
}
|
|
18
18
|
catch (e) {
|
|
@@ -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":";;AAKA,4BAMC;AAED,oCASC;AAtBD,+DAAyE;AACzE,yCAAiF;AAEjF,2CAA6C;AAE7C,SAAgB,QAAQ,CAAC,GAAW,EAAE,QAAgC,EAAE,OAAO,GAAG,IAAA,yBAAc,GAAE;IACjG,MAAM,MAAM,GAAG,IAAA,mBAAS,EAAC,GAAG,CAAC,CAAC;IAE9B,MAAM,cAAc,GAAG,IAAA,sBAAW,EAAC,MAAM,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAErE,OAAO,cAAc,CAAC;AACvB,CAAC;AAED,SAAgB,YAAY,CAAC,GAAW,EAAE,QAAgC,EAAE,OAAO,GAAG,IAAA,yBAAc,GAAE;IACrG,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,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"}
|
|
@@ -1,15 +1,36 @@
|
|
|
1
1
|
import { StmtContext } from '@wsporto/typesql-parser/postgres/PostgreSQLParser';
|
|
2
2
|
import { PostgresColumnSchema } from '../drivers/types';
|
|
3
|
+
import { DynamicSqlInfo2 } from '../mysql-query-analyzer/types';
|
|
3
4
|
import { QueryType } from '../types';
|
|
5
|
+
import { Relation2 } from '../sqlite-query-analyzer/sqlite-describe-nested-query';
|
|
6
|
+
export type NotNullInfo = {
|
|
7
|
+
table_schema: string;
|
|
8
|
+
table_name: string;
|
|
9
|
+
column_name: string;
|
|
10
|
+
is_nullable: boolean;
|
|
11
|
+
};
|
|
4
12
|
export type PostgresTraverseResult = {
|
|
5
13
|
queryType: QueryType;
|
|
6
14
|
multipleRowsResult: boolean;
|
|
7
|
-
|
|
15
|
+
columns: NotNullInfo[];
|
|
8
16
|
parametersNullability: boolean[];
|
|
9
17
|
whereParamtersNullability?: boolean[];
|
|
10
18
|
parameterList: boolean[];
|
|
11
19
|
limit?: number;
|
|
12
20
|
returning?: boolean;
|
|
21
|
+
relations?: Relation2[];
|
|
22
|
+
dynamicQueryInfo?: DynamicSqlInfo2;
|
|
23
|
+
};
|
|
24
|
+
export type Relation3 = {
|
|
25
|
+
name: string;
|
|
26
|
+
alias: string;
|
|
27
|
+
parentRelation: string;
|
|
28
|
+
joinColumn: string;
|
|
29
|
+
};
|
|
30
|
+
export type TraverseOptions = {
|
|
31
|
+
collectNestedInfo?: boolean;
|
|
32
|
+
collectDynamicQueryInfo?: boolean;
|
|
13
33
|
};
|
|
14
|
-
export declare function
|
|
34
|
+
export declare function defaultOptions(): TraverseOptions;
|
|
35
|
+
export declare function traverseSmt(stmt: StmtContext, dbSchema: PostgresColumnSchema[], options: TraverseOptions): PostgresTraverseResult;
|
|
15
36
|
//# 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,EAA8nC,WAAW,EAA4L,MAAM,mDAAmD,CAAC;AAEt4C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAa,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,uDAAuD,CAAC;AAElF,MAAM,MAAM,WAAW,GAAG;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACrB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACpC,SAAS,EAAE,SAAS,CAAC;IACrB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,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;IACpB,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,eAAe,CAAC;CACnC,CAAA;AAuBD,MAAM,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAA;AAED,wBAAgB,cAAc,IAAI,eAAe,CAKhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,oBAAoB,EAAE,EAAE,OAAO,EAAE,eAAe,GAAG,sBAAsB,CA4CjI"}
|