typesql-cli 0.9.5 → 0.10.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 +2 -3
- package/cli.js +91 -82
- package/cli.js.map +1 -1
- package/code-generator.d.ts +7 -7
- package/code-generator.d.ts.map +1 -1
- package/code-generator.js +257 -193
- package/code-generator.js.map +1 -1
- package/describe-dynamic-query.d.ts +1 -1
- package/describe-dynamic-query.d.ts.map +1 -1
- package/describe-dynamic-query.js +51 -39
- package/describe-dynamic-query.js.map +1 -1
- package/describe-nested-query.d.ts +2 -2
- package/describe-nested-query.d.ts.map +1 -1
- package/describe-nested-query.js +43 -24
- package/describe-nested-query.js.map +1 -1
- package/describe-query.d.ts +4 -4
- package/describe-query.d.ts.map +1 -1
- package/describe-query.js +29 -21
- package/describe-query.js.map +1 -1
- package/drivers/libsql.d.ts +3 -3
- package/drivers/libsql.d.ts.map +1 -1
- package/drivers/libsql.js +5 -2
- package/drivers/libsql.js.map +1 -1
- package/mysql-mapping.d.ts +1 -1
- package/mysql-mapping.d.ts.map +1 -1
- package/mysql-mapping.js +9 -9
- package/mysql-mapping.js.map +1 -1
- package/mysql-query-analyzer/collect-constraints.d.ts +4 -4
- package/mysql-query-analyzer/collect-constraints.d.ts.map +1 -1
- package/mysql-query-analyzer/collect-constraints.js +21 -16
- package/mysql-query-analyzer/collect-constraints.js.map +1 -1
- package/mysql-query-analyzer/infer-column-nullability.d.ts +2 -2
- package/mysql-query-analyzer/infer-column-nullability.d.ts.map +1 -1
- package/mysql-query-analyzer/infer-column-nullability.js +81 -67
- package/mysql-query-analyzer/infer-column-nullability.js.map +1 -1
- package/mysql-query-analyzer/infer-param-nullability.d.ts +2 -2
- package/mysql-query-analyzer/infer-param-nullability.d.ts.map +1 -1
- package/mysql-query-analyzer/infer-param-nullability.js +11 -10
- package/mysql-query-analyzer/infer-param-nullability.js.map +1 -1
- package/mysql-query-analyzer/parse.d.ts +2 -2
- package/mysql-query-analyzer/parse.d.ts.map +1 -1
- package/mysql-query-analyzer/parse.js +39 -32
- package/mysql-query-analyzer/parse.js.map +1 -1
- package/mysql-query-analyzer/select-columns.d.ts +4 -4
- package/mysql-query-analyzer/select-columns.d.ts.map +1 -1
- package/mysql-query-analyzer/select-columns.js +77 -52
- package/mysql-query-analyzer/select-columns.js.map +1 -1
- package/mysql-query-analyzer/traverse.d.ts +4 -4
- package/mysql-query-analyzer/traverse.d.ts.map +1 -1
- package/mysql-query-analyzer/traverse.js +312 -206
- package/mysql-query-analyzer/traverse.js.map +1 -1
- package/mysql-query-analyzer/types.d.ts +5 -5
- package/mysql-query-analyzer/types.d.ts.map +1 -1
- package/mysql-query-analyzer/unify.d.ts +2 -2
- package/mysql-query-analyzer/unify.d.ts.map +1 -1
- package/mysql-query-analyzer/unify.js +533 -491
- package/mysql-query-analyzer/unify.js.map +1 -1
- package/mysql-query-analyzer/util.d.ts.map +1 -1
- package/mysql-query-analyzer/util.js +2 -3
- package/mysql-query-analyzer/util.js.map +1 -1
- package/mysql-query-analyzer/verify-multiple-result.d.ts +2 -2
- package/mysql-query-analyzer/verify-multiple-result.d.ts.map +1 -1
- package/mysql-query-analyzer/verify-multiple-result.js +12 -8
- package/mysql-query-analyzer/verify-multiple-result.js.map +1 -1
- package/package.json +46 -45
- package/queryExectutor.d.ts +4 -4
- package/queryExectutor.d.ts.map +1 -1
- package/queryExectutor.js +11 -13
- package/queryExectutor.js.map +1 -1
- package/sql-generator.d.ts +2 -2
- package/sql-generator.d.ts.map +1 -1
- package/sql-generator.js +29 -25
- package/sql-generator.js.map +1 -1
- package/sqlite-query-analyzer/code-generator.d.ts +5 -5
- package/sqlite-query-analyzer/code-generator.d.ts.map +1 -1
- package/sqlite-query-analyzer/code-generator.js +372 -221
- package/sqlite-query-analyzer/code-generator.js.map +1 -1
- package/sqlite-query-analyzer/parser.d.ts +4 -4
- package/sqlite-query-analyzer/parser.d.ts.map +1 -1
- package/sqlite-query-analyzer/parser.js +30 -17
- package/sqlite-query-analyzer/parser.js.map +1 -1
- package/sqlite-query-analyzer/query-executor.d.ts +17 -6
- package/sqlite-query-analyzer/query-executor.d.ts.map +1 -1
- package/sqlite-query-analyzer/query-executor.js +97 -60
- package/sqlite-query-analyzer/query-executor.js.map +1 -1
- package/sqlite-query-analyzer/replace-list-params.d.ts +1 -1
- package/sqlite-query-analyzer/replace-list-params.d.ts.map +1 -1
- package/sqlite-query-analyzer/replace-list-params.js +4 -3
- package/sqlite-query-analyzer/replace-list-params.js.map +1 -1
- package/sqlite-query-analyzer/sqlite-describe-nested-query.d.ts +4 -4
- package/sqlite-query-analyzer/sqlite-describe-nested-query.d.ts.map +1 -1
- package/sqlite-query-analyzer/sqlite-describe-nested-query.js +33 -18
- package/sqlite-query-analyzer/sqlite-describe-nested-query.js.map +1 -1
- package/sqlite-query-analyzer/traverse.d.ts +5 -5
- package/sqlite-query-analyzer/traverse.d.ts.map +1 -1
- package/sqlite-query-analyzer/traverse.js +255 -162
- package/sqlite-query-analyzer/traverse.js.map +1 -1
- package/ts-dynamic-query-descriptor.d.ts +1 -1
- package/ts-dynamic-query-descriptor.d.ts.map +1 -1
- package/ts-dynamic-query-descriptor.js +4 -4
- package/ts-dynamic-query-descriptor.js.map +1 -1
- package/ts-nested-descriptor.d.ts +4 -4
- package/ts-nested-descriptor.d.ts.map +1 -1
- package/ts-nested-descriptor.js +11 -11
- package/ts-nested-descriptor.js.map +1 -1
- package/types.d.ts +14 -14
- package/types.d.ts.map +1 -1
- package/util.d.ts.map +1 -1
- package/util.js.map +1 -1
- package/utility-types.d.ts.map +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"describe-nested-query.js","sourceRoot":"","sources":["../../src/describe-nested-query.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"describe-nested-query.js","sourceRoot":"","sources":["../../src/describe-nested-query.ts"],"names":[],"mappings":"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"}
|
package/describe-query.d.ts
CHANGED
@@ -1,7 +1,7 @@
|
|
1
|
-
import { SchemaDef, TypeSqlError, PreprocessedSql, MySqlDialect } from
|
2
|
-
import { Either } from
|
3
|
-
import { ColumnSchema } from
|
4
|
-
import { InferType, DbType } from
|
1
|
+
import type { SchemaDef, TypeSqlError, PreprocessedSql, MySqlDialect } from './types';
|
2
|
+
import { type Either } from 'fp-ts/lib/Either';
|
3
|
+
import type { ColumnSchema } from './mysql-query-analyzer/types';
|
4
|
+
import type { InferType, DbType } from './mysql-mapping';
|
5
5
|
export declare function describeSql(dbSchema: ColumnSchema[], sql: string): SchemaDef;
|
6
6
|
export declare function verifyNotInferred(type: InferType): DbType | 'any';
|
7
7
|
export declare function parseSql(client: MySqlDialect, sql: string): Promise<Either<TypeSqlError, SchemaDef>>;
|
package/describe-query.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"describe-query.d.ts","sourceRoot":"","sources":["../../src/describe-query.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"describe-query.d.ts","sourceRoot":"","sources":["../../src/describe-query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,SAAS,EAET,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,KAAK,MAAM,EAAuB,MAAM,kBAAkB,CAAC;AACpE,OAAO,KAAK,EAAc,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzD,wBAAgB,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAuG5E;AAiBD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,KAAK,CAIjE;AAED,wBAAsB,QAAQ,CAC7B,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,MAAM,GACT,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAoB1C;AAID,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,mBAwBxC;AAGD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAG5D"}
|
package/describe-query.js
CHANGED
@@ -16,10 +16,12 @@ const queryExectutor_1 = require("./queryExectutor");
|
|
16
16
|
function describeSql(dbSchema, sql) {
|
17
17
|
const { sql: processedSql, namedParameters } = preprocessSql(sql);
|
18
18
|
const queryInfo = (0, parse_1.extractQueryInfo)(sql, dbSchema);
|
19
|
-
if (queryInfo.kind
|
19
|
+
if (queryInfo.kind === 'Select') {
|
20
20
|
const parametersDef = queryInfo.parameters.map((paramInfo, paramIndex) => {
|
21
21
|
const paramDef = {
|
22
|
-
name: namedParameters
|
22
|
+
name: (namedParameters === null || namedParameters === void 0 ? void 0 : namedParameters[paramIndex])
|
23
|
+
? namedParameters[paramIndex]
|
24
|
+
: `param${paramIndex + 1}`,
|
23
25
|
columnType: paramInfo.type,
|
24
26
|
notNull: paramInfo.notNull
|
25
27
|
};
|
@@ -30,7 +32,7 @@ function describeSql(dbSchema, sql) {
|
|
30
32
|
queryType: 'Select',
|
31
33
|
multipleRowsResult: queryInfo.multipleRowsResult,
|
32
34
|
columns: queryInfo.columns,
|
33
|
-
parameters: parametersDef
|
35
|
+
parameters: parametersDef
|
34
36
|
};
|
35
37
|
if (queryInfo.orderByColumns && queryInfo.orderByColumns.length > 0) {
|
36
38
|
schemaDef.orderByColumns = queryInfo.orderByColumns;
|
@@ -43,7 +45,7 @@ function describeSql(dbSchema, sql) {
|
|
43
45
|
}
|
44
46
|
return schemaDef;
|
45
47
|
}
|
46
|
-
if (queryInfo.kind
|
48
|
+
if (queryInfo.kind === 'Insert') {
|
47
49
|
const resultColumns = [
|
48
50
|
{
|
49
51
|
columnName: 'affectedRows',
|
@@ -56,18 +58,20 @@ function describeSql(dbSchema, sql) {
|
|
56
58
|
notNull: true
|
57
59
|
}
|
58
60
|
];
|
59
|
-
const parameters = namedParameters
|
60
|
-
|
61
|
+
const parameters = namedParameters
|
62
|
+
? addParameterNames(queryInfo.parameters, namedParameters)
|
63
|
+
: queryInfo.parameters;
|
64
|
+
const verifiedParameters = parameters.map((param) => (Object.assign(Object.assign({}, param), { columnType: verifyNotInferred(param.columnType) })));
|
61
65
|
const schemaDef = {
|
62
66
|
sql: processedSql,
|
63
67
|
queryType: 'Insert',
|
64
68
|
multipleRowsResult: false,
|
65
69
|
columns: resultColumns,
|
66
|
-
parameters: verifiedParameters
|
70
|
+
parameters: verifiedParameters
|
67
71
|
};
|
68
72
|
return schemaDef;
|
69
73
|
}
|
70
|
-
if (queryInfo.kind
|
74
|
+
if (queryInfo.kind === 'Update') {
|
71
75
|
const resultColumns = [
|
72
76
|
{
|
73
77
|
columnName: 'affectedRows',
|
@@ -81,11 +85,11 @@ function describeSql(dbSchema, sql) {
|
|
81
85
|
multipleRowsResult: false,
|
82
86
|
columns: resultColumns,
|
83
87
|
parameters: queryInfo.parameters,
|
84
|
-
data: queryInfo.data
|
88
|
+
data: queryInfo.data
|
85
89
|
};
|
86
90
|
return schemaDef;
|
87
91
|
}
|
88
|
-
if (queryInfo.kind
|
92
|
+
if (queryInfo.kind === 'Delete') {
|
89
93
|
const resultColumns = [
|
90
94
|
{
|
91
95
|
columnName: 'affectedRows',
|
@@ -93,30 +97,34 @@ function describeSql(dbSchema, sql) {
|
|
93
97
|
notNull: true
|
94
98
|
}
|
95
99
|
];
|
96
|
-
const parameters = namedParameters
|
100
|
+
const parameters = namedParameters
|
101
|
+
? addParameterNames(queryInfo.parameters, namedParameters)
|
102
|
+
: queryInfo.parameters;
|
97
103
|
const schemaDef = {
|
98
104
|
sql: processedSql,
|
99
105
|
queryType: 'Delete',
|
100
106
|
multipleRowsResult: false,
|
101
107
|
columns: resultColumns,
|
102
|
-
parameters
|
108
|
+
parameters
|
103
109
|
};
|
104
110
|
return schemaDef;
|
105
111
|
}
|
106
|
-
throw Error(
|
112
|
+
throw Error('Not supported!');
|
107
113
|
}
|
108
114
|
exports.describeSql = describeSql;
|
109
115
|
function addParameterNames(parameters, namedParameters) {
|
110
116
|
return parameters.map((param, paramIndex) => {
|
111
|
-
const paramDef = Object.assign(Object.assign({}, param), { name: namedParameters
|
117
|
+
const paramDef = Object.assign(Object.assign({}, param), { name: (namedParameters === null || namedParameters === void 0 ? void 0 : namedParameters[paramIndex])
|
118
|
+
? namedParameters[paramIndex]
|
119
|
+
: param.name });
|
112
120
|
return paramDef;
|
113
121
|
});
|
114
122
|
}
|
115
123
|
function verifyNotInferred(type) {
|
116
|
-
if (type
|
117
|
-
return
|
118
|
-
if (type
|
119
|
-
return
|
124
|
+
if (type === '?' || type === 'any')
|
125
|
+
return 'any';
|
126
|
+
if (type === 'number')
|
127
|
+
return 'double';
|
120
128
|
return type;
|
121
129
|
}
|
122
130
|
exports.verifyNotInferred = verifyNotInferred;
|
@@ -138,7 +146,7 @@ function parseSql(client, sql) {
|
|
138
146
|
catch (e) {
|
139
147
|
const InvalidSqlError = {
|
140
148
|
name: 'Invalid SQL',
|
141
|
-
description: e.message
|
149
|
+
description: e.message
|
142
150
|
};
|
143
151
|
return (0, Either_1.left)(InvalidSqlError);
|
144
152
|
}
|
@@ -156,12 +164,12 @@ function preprocessSql(sql) {
|
|
156
164
|
var _a;
|
157
165
|
let newLine = line;
|
158
166
|
if (!line.trim().startsWith('--')) {
|
159
|
-
const parameters = ((_a = line.match(regex)) === null || _a === void 0 ? void 0 : _a.map(param => param.slice(1))) || [];
|
167
|
+
const parameters = ((_a = line.match(regex)) === null || _a === void 0 ? void 0 : _a.map((param) => param.slice(1))) || [];
|
160
168
|
allParameters.push(...parameters);
|
161
169
|
newLine = line.replace(regex, '?');
|
162
170
|
}
|
163
171
|
newSql += newLine;
|
164
|
-
if (index
|
172
|
+
if (index !== array.length - 1) {
|
165
173
|
newSql += '\n';
|
166
174
|
}
|
167
175
|
});
|
package/describe-query.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"describe-query.js","sourceRoot":"","sources":["../../src/describe-query.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
1
|
+
{"version":3,"file":"describe-query.js","sourceRoot":"","sources":["../../src/describe-query.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,wDAAgE;AAChE,6CAAoE;AAGpE,qDAA+D;AAE/D,SAAgB,WAAW,CAAC,QAAwB,EAAE,GAAW;IAChE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IAClE,MAAM,SAAS,GAAG,IAAA,wBAAgB,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAClD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,aAAa,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE;YACxE,MAAM,QAAQ,GAAiB;gBAC9B,IAAI,EAAE,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,UAAU,CAAC;oBAClC,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC;oBAC7B,CAAC,CAAC,QAAQ,UAAU,GAAG,CAAC,EAAE;gBAC3B,UAAU,EAAE,SAAS,CAAC,IAAI;gBAC1B,OAAO,EAAE,SAAS,CAAC,OAAO;aAC1B,CAAC;YACF,OAAO,QAAQ,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAc;YAC5B,GAAG,EAAE,YAAY;YACjB,SAAS,EAAE,QAAQ;YACnB,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;YAChD,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,UAAU,EAAE,aAAa;SACzB,CAAC;QACF,IAAI,SAAS,CAAC,cAAc,IAAI,SAAS,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrE,SAAS,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;QACrD,CAAC;QACD,IAAI,SAAS,CAAC,gBAAgB,EAAE,CAAC;YAChC,SAAS,CAAC,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAC;QACzD,CAAC;QACD,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;YAC5B,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC;QACpD,CAAC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,aAAa,GAAiB;YACnC;gBACC,UAAU,EAAE,cAAc;gBAC1B,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,IAAI;aACb;YACD;gBACC,UAAU,EAAE,UAAU;gBACtB,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,IAAI;aACb;SACD,CAAC;QAEF,MAAM,UAAU,GAAG,eAAe;YACjC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,UAAU,EAAE,eAAe,CAAC;YAC1D,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC;QACxB,MAAM,kBAAkB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iCACjD,KAAK,KACR,UAAU,EAAE,iBAAiB,CAAC,KAAK,CAAC,UAAU,CAAC,IAC9C,CAAC,CAAC;QACJ,MAAM,SAAS,GAAc;YAC5B,GAAG,EAAE,YAAY;YACjB,SAAS,EAAE,QAAQ;YACnB,kBAAkB,EAAE,KAAK;YACzB,OAAO,EAAE,aAAa;YACtB,UAAU,EAAE,kBAAkB;SAC9B,CAAC;QACF,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,aAAa,GAAiB;YACnC;gBACC,UAAU,EAAE,cAAc;gBAC1B,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,IAAI;aACb;SACD,CAAC;QACF,MAAM,SAAS,GAAc;YAC5B,GAAG,EAAE,YAAY;YACjB,SAAS,EAAE,QAAQ;YACnB,kBAAkB,EAAE,KAAK;YACzB,OAAO,EAAE,aAAa;YACtB,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,IAAI,EAAE,SAAS,CAAC,IAAI;SACpB,CAAC;QACF,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,aAAa,GAAiB;YACnC;gBACC,UAAU,EAAE,cAAc;gBAC1B,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,IAAI;aACb;SACD,CAAC;QACF,MAAM,UAAU,GAAG,eAAe;YACjC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,UAAU,EAAE,eAAe,CAAC;YAC1D,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC;QACxB,MAAM,SAAS,GAAc;YAC5B,GAAG,EAAE,YAAY;YACjB,SAAS,EAAE,QAAQ;YACnB,kBAAkB,EAAE,KAAK;YACzB,OAAO,EAAE,aAAa;YACtB,UAAU;SACV,CAAC;QACF,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,MAAM,KAAK,CAAC,gBAAgB,CAAC,CAAC;AAC/B,CAAC;AAvGD,kCAuGC;AAED,SAAS,iBAAiB,CACzB,UAA0B,EAC1B,eAAyB;IAEzB,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QAC3C,MAAM,QAAQ,mCACV,KAAK,KACR,IAAI,EAAE,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,UAAU,CAAC;gBAClC,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC;gBAC7B,CAAC,CAAC,KAAK,CAAC,IAAI,GACb,CAAC;QACF,OAAO,QAAQ,CAAC;IACjB,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,iBAAiB,CAAC,IAAe;IAChD,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IACjD,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACvC,OAAO,IAAI,CAAC;AACb,CAAC;AAJD,8CAIC;AAED,SAAsB,QAAQ,CAC7B,MAAoB,EACpB,GAAW;;QAEX,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,aAAa,GAAG,MAAM,IAAA,2BAAU,EAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACpE,IAAI,IAAA,eAAM,EAAC,aAAa,CAAC,EAAE,CAAC;YAC3B,OAAO,aAAa,CAAC;QACtB,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAe,EAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACrE,IAAI,IAAA,eAAM,EAAC,QAAQ,CAAC,EAAE,CAAC;YACtB,OAAO,IAAA,aAAI,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAChD,OAAO,IAAA,cAAK,EAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACjB,MAAM,eAAe,GAAiB;gBACrC,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,CAAC,CAAC,OAAO;aACtB,CAAC;YACF,OAAO,IAAA,aAAI,EAAC,eAAe,CAAC,CAAC;QAC9B,CAAC;IACF,CAAC;CAAA;AAvBD,4BAuBC;AAED,yDAAyD;AACzD,4HAA4H;AAC5H,SAAgB,aAAa,CAAC,GAAW;IACxC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;;QACpC,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,MAAM,UAAU,GACf,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,0CAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAI,EAAE,CAAC;YACzD,aAAa,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;YAClC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,IAAI,OAAO,CAAC;QAClB,IAAI,KAAK,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,IAAI,CAAC;QAChB,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAoB;QACrC,GAAG,EAAE,MAAM;QACX,eAAe,EAAE,aAAa;KAC9B,CAAC;IACF,OAAO,YAAY,CAAC;AACrB,CAAC;AAxBD,sCAwBC;AAED,qCAAqC;AACrC,SAAgB,aAAa,CAAC,GAAW,EAAE,UAAkB;IAC5D,MAAM,KAAK,GAAG,MAAM,UAAU,EAAE,CAAC;IACjC,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC;AAC7C,CAAC;AAHD,sCAGC"}
|
package/drivers/libsql.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import { Either } from
|
2
|
-
import { DatabaseClient, TypeSqlError } from
|
3
|
-
export declare function createLibSqlClient(url: string, authToken: string): Either<TypeSqlError, DatabaseClient>;
|
1
|
+
import { type Either } from 'fp-ts/lib/Either';
|
2
|
+
import type { DatabaseClient, TypeSqlError } from '../types';
|
3
|
+
export declare function createLibSqlClient(url: string, attachList: string[], authToken: string): Either<TypeSqlError, DatabaseClient>;
|
4
4
|
//# sourceMappingURL=libsql.d.ts.map
|
package/drivers/libsql.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"libsql.d.ts","sourceRoot":"","sources":["../../../src/drivers/libsql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,kBAAkB,CAAC;
|
1
|
+
{"version":3,"file":"libsql.d.ts","sourceRoot":"","sources":["../../../src/drivers/libsql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAS,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAG7D,wBAAgB,kBAAkB,CACjC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAAE,EACpB,SAAS,EAAE,MAAM,GACf,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CActC"}
|
package/drivers/libsql.js
CHANGED
@@ -6,11 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.createLibSqlClient = void 0;
|
7
7
|
const Either_1 = require("fp-ts/lib/Either");
|
8
8
|
const libsql_1 = __importDefault(require("libsql"));
|
9
|
-
function createLibSqlClient(url, authToken) {
|
9
|
+
function createLibSqlClient(url, attachList, authToken) {
|
10
10
|
const opts = {
|
11
|
-
authToken: authToken
|
11
|
+
authToken: authToken
|
12
12
|
};
|
13
13
|
const db = new libsql_1.default(url, opts);
|
14
|
+
for (const attach of attachList) {
|
15
|
+
db.exec(`attach database ${attach}`);
|
16
|
+
}
|
14
17
|
return (0, Either_1.right)({
|
15
18
|
type: 'libsql',
|
16
19
|
client: db
|
package/drivers/libsql.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"libsql.js","sourceRoot":"","sources":["../../../src/drivers/libsql.ts"],"names":[],"mappings":";;;;;;AAAA,
|
1
|
+
{"version":3,"file":"libsql.js","sourceRoot":"","sources":["../../../src/drivers/libsql.ts"],"names":[],"mappings":";;;;;;AAAA,6CAAsD;AAEtD,oDAA8B;AAE9B,SAAgB,kBAAkB,CACjC,GAAW,EACX,UAAoB,EACpB,SAAiB;IAEjB,MAAM,IAAI,GAAG;QACZ,SAAS,EAAE,SAAS;KACb,CAAC;IAET,MAAM,EAAE,GAAG,IAAI,gBAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACnC,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;QACjC,EAAE,CAAC,IAAI,CAAC,mBAAmB,MAAM,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,IAAA,cAAK,EAAC;QACZ,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,EAAE;KACV,CAAC,CAAC;AACJ,CAAC;AAlBD,gDAkBC"}
|
package/mysql-mapping.d.ts
CHANGED
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,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;
|
1
|
+
{"version":3,"file":"mysql-mapping.d.ts","sourceRoot":"","sources":["../../src/mysql-mapping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,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,GAAG,GAAG,QAAQ,GAAG,KAAK,CAAC;AAExE,MAAM,MAAM,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;AAE5C,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,CAyEnE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,WAEtD;AAED,wBAAgB,0BAA0B,CACzC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,EACf,YAAY,EAAE,MAAM,GAClB,SAAS,GAAG,MAAM,CA4BpB;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
CHANGED
@@ -71,16 +71,16 @@ function converToTsType(mySqlType) {
|
|
71
71
|
case 'blob':
|
72
72
|
return 'Uint8Array';
|
73
73
|
default:
|
74
|
-
if (mySqlType.startsWith(
|
75
|
-
const enumValues = mySqlType.substring(mySqlType.indexOf(
|
76
|
-
return enumValues.split(
|
74
|
+
if (mySqlType.startsWith('enum(')) {
|
75
|
+
const enumValues = mySqlType.substring(mySqlType.indexOf('(') + 1, mySqlType.indexOf(')'));
|
76
|
+
return enumValues.split(',').join(' | ');
|
77
77
|
}
|
78
78
|
return 'any';
|
79
79
|
}
|
80
80
|
}
|
81
81
|
exports.converToTsType = converToTsType;
|
82
82
|
function checkFlag(flags, flag) {
|
83
|
-
return (flags & flag)
|
83
|
+
return (flags & flag) !== 0;
|
84
84
|
}
|
85
85
|
exports.checkFlag = checkFlag;
|
86
86
|
function convertTypeCodeToMysqlType(typeCode, flags, columnLength) {
|
@@ -91,23 +91,23 @@ function convertTypeCodeToMysqlType(typeCode, flags, columnLength) {
|
|
91
91
|
return 'enum';
|
92
92
|
}
|
93
93
|
const mappedType = exports.typesMapping[typeCode];
|
94
|
-
if (mappedType
|
94
|
+
if (mappedType === 'varchar' && flags & FlagEnum.BINARY_FLAG) {
|
95
95
|
return 'varbinary';
|
96
96
|
}
|
97
97
|
//max column lenght = 255 but the mysql driver return columnLenght=262140 (octet lenght?)
|
98
|
-
if (mappedType
|
98
|
+
if (mappedType === 'text' && columnLength === 255 * 4) {
|
99
99
|
return 'tinytext';
|
100
100
|
}
|
101
101
|
//max column lenght = 65535 but the mysql driver return columnLenght=65535 * 4 (octet lenght?)
|
102
|
-
if (mappedType
|
102
|
+
if (mappedType === 'text' && columnLength === 65535 * 4) {
|
103
103
|
return 'text';
|
104
104
|
}
|
105
105
|
//max column lenght = 16777215 but the mysql driver return columnLenght=16777215 * 4 (octet lenght?)
|
106
|
-
if (mappedType
|
106
|
+
if (mappedType === 'text' && columnLength === 16777215 * 4) {
|
107
107
|
return 'mediumtext';
|
108
108
|
}
|
109
109
|
//max column lenght = 4294967295
|
110
|
-
if (mappedType
|
110
|
+
if (mappedType === 'text' && columnLength === 4294967295) {
|
111
111
|
return 'longtext';
|
112
112
|
}
|
113
113
|
return mappedType;
|
package/mysql-mapping.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mysql-mapping.js","sourceRoot":"","sources":["../../src/mysql-mapping.ts"],"names":[],"mappings":";;;AAEA,IAAY,QAMX;AAND,WAAY,QAAQ;
|
1
|
+
{"version":3,"file":"mysql-mapping.js","sourceRoot":"","sources":["../../src/mysql-mapping.ts"],"names":[],"mappings":";;;AAEA,IAAY,QAMX;AAND,WAAY,QAAQ;IACnB,+CAAY,CAAA;IACZ,6CAAW,CAAA;IACX,uDAAiB,CAAA;IACjB,mDAAe,CAAA;IACf,kDAAe,CAAA;AAChB,CAAC,EANW,QAAQ,wBAAR,QAAQ,QAMnB;AAuED,SAAgB,cAAc,CAAC,SAA4B;IAC1D,QAAQ,SAAS,EAAE,CAAC;QACnB,KAAK,SAAS,CAAC;QACf,KAAK,UAAU,CAAC;QAChB,KAAK,KAAK,CAAC;QACX,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,WAAW,CAAC;QACjB,KAAK,MAAM;YACV,OAAO,QAAQ,CAAC;QAEjB,KAAK,WAAW,CAAC;QACjB,KAAK,YAAY,CAAC;QAClB,KAAK,OAAO,CAAC;QACb,KAAK,SAAS,CAAC;QACf,KAAK,UAAU,CAAC;QAChB,KAAK,UAAU,CAAC;QAChB,KAAK,aAAa,CAAC;QACnB,KAAK,QAAQ;YACZ,OAAO,UAAU,CAAC;QAEnB,KAAK,SAAS,CAAC;QACf,KAAK,WAAW,CAAC;QACjB,KAAK,SAAS,CAAC;QACf,KAAK,UAAU;YACd,OAAO,QAAQ,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW;YACf,OAAO,UAAU,CAAC;QACnB,KAAK,WAAW,CAAC;QACjB,KAAK,YAAY,CAAC;QAClB,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS,CAAC;QACf,KAAK,UAAU,CAAC;QAChB,KAAK,WAAW,CAAC;QACjB,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO;YACX,OAAO,MAAM,CAAC;QACf,KAAK,KAAK;YACT,OAAO,SAAS,CAAC;QAClB,KAAK,OAAO;YACX,OAAO,WAAW,CAAC;QACpB,KAAK,MAAM;YACV,OAAO,QAAQ,CAAC;QACjB,KAAK,MAAM;YACV,OAAO,MAAM,CAAC;QACf,KAAK,UAAU,CAAC;QAChB,KAAK,YAAY,CAAC;QAClB,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM;YACV,OAAO,QAAQ,CAAC;QACjB,KAAK,QAAQ;YACZ,OAAO,UAAU,CAAC;QACnB,KAAK,KAAK;YACT,OAAO,KAAK,CAAC;QACd,KAAK,UAAU,CAAC;QAChB,KAAK,YAAY,CAAC;QAClB,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM;YACV,OAAO,YAAY,CAAC;QACrB;YACC,IAAI,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnC,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CACrC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAC1B,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CACtB,CAAC;gBACF,OAAO,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAW,CAAC;YACpD,CAAC;YACD,OAAO,KAAK,CAAC;IACf,CAAC;AACF,CAAC;AAzED,wCAyEC;AAED,SAAgB,SAAS,CAAC,KAAa,EAAE,IAAc;IACtD,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAFD,8BAEC;AAED,SAAgB,0BAA0B,CACzC,QAAgB,EAChB,KAAe,EACf,YAAoB;IAEpB,IAAI,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC;IACd,CAAC;IACD,IAAI,KAAK,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAChC,OAAO,MAAM,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,oBAAY,CAAC,QAAQ,CAAC,CAAC;IAC1C,IAAI,UAAU,KAAK,SAAS,IAAI,KAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC9D,OAAO,WAAW,CAAC;IACpB,CAAC;IACD,yFAAyF;IACzF,IAAI,UAAU,KAAK,MAAM,IAAI,YAAY,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;QACvD,OAAO,UAAU,CAAC;IACnB,CAAC;IACD,8FAA8F;IAC9F,IAAI,UAAU,KAAK,MAAM,IAAI,YAAY,KAAK,KAAK,GAAG,CAAC,EAAE,CAAC;QACzD,OAAO,MAAM,CAAC;IACf,CAAC;IACD,oGAAoG;IACpG,IAAI,UAAU,KAAK,MAAM,IAAI,YAAY,KAAK,QAAQ,GAAG,CAAC,EAAE,CAAC;QAC5D,OAAO,YAAY,CAAC;IACrB,CAAC;IACD,gCAAgC;IAChC,IAAI,UAAU,KAAK,MAAM,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;QAC1D,OAAO,UAAU,CAAC;IACnB,CAAC;IACD,OAAO,UAAU,CAAC;AACnB,CAAC;AAhCD,gEAgCC;AAMY,QAAA,YAAY,GAAkB;IAC1C,CAAC,EAAE,SAAS,EAAE,4BAA4B;IAC1C,CAAC,EAAE,SAAS;IACZ,CAAC,EAAE,UAAU;IACb,CAAC,EAAE,KAAK;IACR,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,WAAW;IACd,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,WAAW;IACd,EAAE,EAAE,MAAM;IACV,EAAE,EAAE,MAAM;IACV,EAAE,EAAE,UAAU;IACd,EAAE,EAAE,MAAM;IACV,EAAE,EAAE,SAAS,EAAE,UAAU;IACzB,EAAE,EAAE,SAAS,EAAE,4BAA4B;IAC3C,EAAE,EAAE,KAAK;IACT,EAAE,EAAE,YAAY,EAAE,aAAa;IAC/B,EAAE,EAAE,WAAW,EAAE,YAAY;IAC7B,EAAE,EAAE,OAAO,EAAE,QAAQ;IACrB,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,SAAS,EAAE,YAAY;IAC5B,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,UAAU;IACf,GAAG,EAAE,YAAY;IACjB,GAAG,EAAE,UAAU;IACf,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,SAAS,EAAE,2BAA2B;IAC3C,GAAG,EAAE,QAAQ;IACb,GAAG,EAAE,UAAU;CACf,CAAC"}
|
@@ -1,7 +1,7 @@
|
|
1
|
-
import { SimpleExprFunctionContext, ExprContext, InsertStatementContext, DeleteStatementContext } from '@wsporto/ts-mysql-parser';
|
2
|
-
import { ColumnSchema, ColumnDef, TypeVar, Type, Constraint, SubstitutionHash, TypeAndNullInfer } from
|
3
|
-
import { InferType } from
|
4
|
-
import TerminalNode from
|
1
|
+
import type { SimpleExprFunctionContext, ExprContext, InsertStatementContext, DeleteStatementContext } from '@wsporto/ts-mysql-parser';
|
2
|
+
import type { ColumnSchema, ColumnDef, TypeVar, Type, Constraint, SubstitutionHash, TypeAndNullInfer } from './types';
|
3
|
+
import type { InferType } from '../mysql-mapping';
|
4
|
+
import type TerminalNode from '@wsporto/ts-mysql-parser';
|
5
5
|
export declare function freshVar(name: string, typeVar: InferType, table?: string, list?: true): TypeVar;
|
6
6
|
export declare function createColumnType(col: ColumnDef): TypeVar;
|
7
7
|
export declare function createColumnTypeFomColumnSchema(col: ColumnSchema): TypeVar;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"collect-constraints.d.ts","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/collect-constraints.ts"],"names":[],"mappings":"AAEA,OAAO,
|
1
|
+
{"version":3,"file":"collect-constraints.d.ts","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/collect-constraints.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACX,yBAAyB,EACzB,WAAW,EACX,sBAAsB,EACtB,sBAAsB,EACtB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EACX,YAAY,EACZ,SAAS,EACT,OAAO,EACP,IAAI,EACJ,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,EAAa,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,KAAK,YAAY,MAAM,0BAA0B,CAAC;AAGzD,wBAAgB,QAAQ,CACvB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,SAAS,EAClB,KAAK,CAAC,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,IAAI,GACT,OAAO,CAYT;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,WAS9C;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,YAAY,WAShE;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,YAAY,CAAC;AAEvD,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,sBAAsB,UAGzE;AAED,wBAAgB,gBAAgB,CAC/B,eAAe,EAAE,sBAAsB,EACvC,WAAW,EAAE,SAAS,EAAE,eA0BxB;AAED,wBAAgB,gBAAgB,CAC/B,eAAe,EAAE,sBAAsB,EACvC,QAAQ,EAAE,YAAY,EAAE,GACtB,SAAS,EAAE,CAmBb;AAED,wBAAgB,gBAAgB,CAC/B,UAAU,EAAE,gBAAgB,EAAE,EAC9B,WAAW,EAAE,UAAU,EAAE,GACvB,SAAS,EAAE,CAQb;AAED,wBAAgB,UAAU,CACzB,aAAa,EAAE,gBAAgB,EAC/B,OAAO,EAAE,IAAI,GACX,SAAS,CAqBX;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,QAWjD;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,WAK5C;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,WAEhD;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,WAE5C;AAED,wBAAgB,eAAe,CAAC,kBAAkB,EAAE,yBAAyB,UAa5E;AAED,MAAM,MAAM,oBAAoB,GAAG;IAClC,IAAI,EAAE,sBAAsB,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC/B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,UAAU,EAAE,OAAO,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG,iBAAiB,CAAC"}
|
@@ -54,7 +54,7 @@ function getInsertColumns(insertStatement, fromColumns) {
|
|
54
54
|
const insertIntoTable = getInsertIntoTable(insertStatement);
|
55
55
|
const insertFields = insertStatement.insertFromConstructor() ||
|
56
56
|
insertStatement.insertQueryExpression();
|
57
|
-
const fields = (_a = insertFields === null || insertFields === void 0 ? void 0 : insertFields.fields()) === null || _a === void 0 ? void 0 : _a.insertIdentifier_list().map(insertIdentifier => {
|
57
|
+
const fields = (_a = insertFields === null || insertFields === void 0 ? void 0 : insertFields.fields()) === null || _a === void 0 ? void 0 : _a.insertIdentifier_list().map((insertIdentifier) => {
|
58
58
|
const colRef = insertIdentifier.columnRef();
|
59
59
|
if (colRef) {
|
60
60
|
const fieldName = (0, select_columns_1.splitName)(colRef.getText());
|
@@ -65,7 +65,7 @@ function getInsertColumns(insertStatement, fromColumns) {
|
|
65
65
|
});
|
66
66
|
//check insert stmt without fields (only values). Ex.: insert into mytable values()
|
67
67
|
if (!fields) {
|
68
|
-
return fromColumns.filter(column => column.table
|
68
|
+
return fromColumns.filter((column) => column.table === insertIntoTable);
|
69
69
|
}
|
70
70
|
return fields;
|
71
71
|
}
|
@@ -77,8 +77,8 @@ function getDeleteColumns(deleteStatement, dbSchema) {
|
|
77
77
|
const tableAlias = (_b = deleteStatement.tableAlias()) === null || _b === void 0 ? void 0 : _b.getText();
|
78
78
|
const tableName = (0, select_columns_1.splitName)(tableNameStr).name;
|
79
79
|
const columns = dbSchema
|
80
|
-
.filter(col => col.table
|
81
|
-
.map(col => {
|
80
|
+
.filter((col) => col.table === tableName)
|
81
|
+
.map((col) => {
|
82
82
|
const colDef = {
|
83
83
|
table: tableNameStr,
|
84
84
|
tableAlias: tableAlias,
|
@@ -95,47 +95,48 @@ exports.getDeleteColumns = getDeleteColumns;
|
|
95
95
|
function generateTypeInfo(namedNodes, constraints) {
|
96
96
|
const substitutions = {};
|
97
97
|
(0, unify_1.unify)(constraints, substitutions);
|
98
|
-
const parameters = namedNodes.map(param => getVarType(substitutions, param.type));
|
98
|
+
const parameters = namedNodes.map((param) => getVarType(substitutions, param.type));
|
99
99
|
return parameters;
|
100
100
|
}
|
101
101
|
exports.generateTypeInfo = generateTypeInfo;
|
102
102
|
function getVarType(substitutions, typeVar) {
|
103
|
-
if (typeVar.kind
|
103
|
+
if (typeVar.kind === 'TypeVar') {
|
104
104
|
// if (typeVar.type != '?') {
|
105
105
|
// return typeVar.type;
|
106
106
|
// }
|
107
107
|
const subs = substitutions[typeVar.id];
|
108
108
|
if (subs) {
|
109
|
-
if (subs.id
|
109
|
+
if (subs.id !== typeVar.id) {
|
110
110
|
return getVarType(substitutions, subs);
|
111
111
|
}
|
112
|
-
const resultType = subs.list || typeVar.list ? subs.type
|
112
|
+
const resultType = subs.list || typeVar.list ? `${subs.type}[]` : subs.type;
|
113
113
|
return resultType;
|
114
114
|
}
|
115
115
|
// if (!subs) {
|
116
116
|
// return typeVar.type as MySqlType;
|
117
117
|
// }
|
118
|
-
const resultType = typeVar.list ? typeVar.type
|
118
|
+
const resultType = typeVar.list ? `${typeVar.type}[]` : typeVar.type;
|
119
119
|
return resultType;
|
120
120
|
}
|
121
121
|
return '?';
|
122
122
|
}
|
123
123
|
exports.getVarType = getVarType;
|
124
124
|
function verifyDateTypesCoercion(type) {
|
125
|
-
if (type.kind
|
125
|
+
if (type.kind === 'TypeVar' && isDateTimeLiteral(type.name)) {
|
126
126
|
type.type = 'datetime';
|
127
127
|
}
|
128
|
-
if (type.kind
|
128
|
+
if (type.kind === 'TypeVar' && isDateLiteral(type.name)) {
|
129
129
|
type.type = 'date';
|
130
130
|
}
|
131
|
-
if (type.kind
|
131
|
+
if (type.kind === 'TypeVar' && isTimeLiteral(type.name)) {
|
132
132
|
type.type = 'time';
|
133
133
|
}
|
134
134
|
return type;
|
135
135
|
}
|
136
136
|
exports.verifyDateTypesCoercion = verifyDateTypesCoercion;
|
137
137
|
function isTimeLiteral(literal) {
|
138
|
-
return (0, moment_1.default)(literal, 'HH:mm:ss', true).isValid() ||
|
138
|
+
return ((0, moment_1.default)(literal, 'HH:mm:ss', true).isValid() ||
|
139
|
+
(0, moment_1.default)(literal, 'HH:mm', true).isValid());
|
139
140
|
}
|
140
141
|
exports.isTimeLiteral = isTimeLiteral;
|
141
142
|
function isDateTimeLiteral(literal) {
|
@@ -143,13 +144,17 @@ function isDateTimeLiteral(literal) {
|
|
143
144
|
}
|
144
145
|
exports.isDateTimeLiteral = isDateTimeLiteral;
|
145
146
|
function isDateLiteral(literal) {
|
146
|
-
return (0, moment_1.default)(literal,
|
147
|
+
return (0, moment_1.default)(literal, 'YYYY-MM-DD', true).isValid();
|
147
148
|
}
|
148
149
|
exports.isDateLiteral = isDateLiteral;
|
149
150
|
function getFunctionName(simpleExprFunction) {
|
150
151
|
var _a, _b;
|
151
|
-
return ((_a = simpleExprFunction
|
152
|
-
|
152
|
+
return (((_a = simpleExprFunction
|
153
|
+
.functionCall()
|
154
|
+
.pureIdentifier()) === null || _a === void 0 ? void 0 : _a.getText().toLowerCase()) ||
|
155
|
+
((_b = simpleExprFunction
|
156
|
+
.functionCall()
|
157
|
+
.qualifiedIdentifier()) === null || _b === void 0 ? void 0 : _b.getText().toLowerCase()));
|
153
158
|
}
|
154
159
|
exports.getFunctionName = getFunctionName;
|
155
160
|
//# sourceMappingURL=collect-constraints.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"collect-constraints.js","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/collect-constraints.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;
|
1
|
+
{"version":3,"file":"collect-constraints.js","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/collect-constraints.ts"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import { QuerySpecificationContext, ExprContext } from '@wsporto/ts-mysql-parser';
|
2
|
-
import { ColumnSchema, FieldName, ColumnDef } from
|
1
|
+
import { QuerySpecificationContext, type ExprContext } from '@wsporto/ts-mysql-parser';
|
2
|
+
import type { ColumnSchema, FieldName, ColumnDef } from './types';
|
3
3
|
export declare function parseAndInferNotNull(sql: string, dbSchema: ColumnSchema[]): boolean[];
|
4
4
|
export declare function inferNotNull(querySpec: QuerySpecificationContext, dbSchema: ColumnSchema[], fromColumns: ColumnDef[]): boolean[];
|
5
5
|
export declare function possibleNull(field: FieldName, exprContext: ExprContext): boolean;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"infer-column-nullability.d.ts","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/infer-column-nullability.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"infer-column-nullability.d.ts","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/infer-column-nullability.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,yBAAyB,EAEzB,KAAK,WAAW,EA4BhB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAYlE,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,aAQzE;AAED,wBAAgB,YAAY,CAC3B,SAAS,EAAE,yBAAyB,EACpC,QAAQ,EAAE,YAAY,EAAE,EACxB,WAAW,EAAE,SAAS,EAAE,aAuBxB;AA2XD,wBAAgB,YAAY,CAC3B,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,WAAW,GACtB,OAAO,CAuDT"}
|