taon-type-sql 18.0.20 → 18.0.22
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/assets/shared/shared_folder_info.txt +1 -1
- package/index.js +15 -2
- package/index.js.map +1 -1
- package/lib/build-info._auto-generated_.js.map +1 -1
- package/lib/builder/column/basic-column.js +8 -12
- package/lib/builder/column/basic-column.js.map +1 -1
- package/lib/builder/column/boolean-column.js +9 -14
- package/lib/builder/column/boolean-column.js.map +1 -1
- package/lib/builder/column/comparable-column.js +29 -33
- package/lib/builder/column/comparable-column.js.map +1 -1
- package/lib/builder/column/date-column.js +9 -14
- package/lib/builder/column/date-column.js.map +1 -1
- package/lib/builder/column/number-column.js +12 -17
- package/lib/builder/column/number-column.js.map +1 -1
- package/lib/builder/column/query-column.js +15 -12
- package/lib/builder/column/query-column.js.map +1 -1
- package/lib/builder/column/string-column.js +25 -30
- package/lib/builder/column/string-column.js.map +1 -1
- package/lib/builder/column/value-column.js +16 -20
- package/lib/builder/column/value-column.js.map +1 -1
- package/lib/builder/condition/query-column-condition.js +16 -21
- package/lib/builder/condition/query-column-condition.js.map +1 -1
- package/lib/builder/condition/query-condition-chain.js +22 -22
- package/lib/builder/condition/query-condition-chain.js.map +1 -1
- package/lib/builder/condition/query-condition.js +2 -5
- package/lib/builder/condition/query-condition.js.map +1 -1
- package/lib/builder/condition/query-join-condition.js +16 -17
- package/lib/builder/condition/query-join-condition.js.map +1 -1
- package/lib/builder/helpers/generics-helper.js +2 -5
- package/lib/builder/helpers/generics-helper.js.map +1 -1
- package/lib/builder/helpers/internal-types.js.map +1 -1
- package/lib/builder/join/joined-tables-chain.js +9 -7
- package/lib/builder/join/joined-tables-chain.js.map +1 -1
- package/lib/builder/join/joined-tables.js +14 -13
- package/lib/builder/join/joined-tables.js.map +1 -1
- package/lib/builder/other/query-ordering.js +10 -8
- package/lib/builder/other/query-ordering.js.map +1 -1
- package/lib/builder/query/select-query.js +30 -46
- package/lib/builder/query/select-query.js.map +1 -1
- package/lib/builder/query/table-condition-query.js +16 -12
- package/lib/builder/query/table-condition-query.js.map +1 -1
- package/lib/builder/query/table-query.js +36 -39
- package/lib/builder/query/table-query.js.map +1 -1
- package/lib/builder/query-source.js +10 -10
- package/lib/builder/query-source.js.map +1 -1
- package/lib/builder/query-table.js +18 -16
- package/lib/builder/query-table.js.map +1 -1
- package/lib/client/mysql.js +6 -10
- package/lib/client/mysql.js.map +1 -1
- package/lib/client/pg.js +6 -10
- package/lib/client/pg.js.map +1 -1
- package/lib/client/query-processor.js +13 -15
- package/lib/client/query-processor.js.map +1 -1
- package/lib/converter/param-converter.js +3 -3
- package/lib/converter/param-converter.js.map +1 -1
- package/lib/converter/parameterized-converter.js +8 -8
- package/lib/converter/parameterized-converter.js.map +1 -1
- package/lib/converter/query-converter.js +47 -49
- package/lib/converter/query-converter.js.map +1 -1
- package/lib/converter/result-converter.js +19 -19
- package/lib/converter/result-converter.js.map +1 -1
- package/lib/converter/sql-converter.js +3 -3
- package/lib/converter/sql-converter.js.map +1 -1
- package/lib/converter/type-converter.js +1 -1
- package/lib/converter/type-converter.js.map +1 -1
- package/lib/converter/types.js.map +1 -1
- package/lib/index._auto-generated_.d.ts +1 -0
- package/lib/index._auto-generated_.js.map +1 -1
- package/lib/index.js.map +1 -1
- package/migrations/index.js +15 -2
- package/migrations/index.js.map +1 -1
- package/migrations/migrations_index._auto-generated_.d.ts +1 -0
- package/migrations/migrations_index._auto-generated_.js.map +1 -1
- package/package.json +7 -31
- package/src.d.ts +1 -1
- package/tmp-environment.json +8 -365
- package/browser/package.json +0 -25
- package/taon.jsonc +0 -23
- package/websql/package.json +0 -25
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createQueryProcessor = createQueryProcessor;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
const ng2_logger_1 = require("ng2-logger");
|
|
5
|
+
const parameterized_converter_1 = require("../converter/parameterized-converter");
|
|
6
|
+
const sql_converter_1 = require("../converter/sql-converter");
|
|
7
|
+
const log = ng2_logger_1.Log.create('query processor');
|
|
8
|
+
const DEFAULT_OPTIONS = {
|
|
9
9
|
lineBreaks: false,
|
|
10
10
|
parameterized: true,
|
|
11
11
|
logging: true,
|
|
@@ -13,7 +13,7 @@ var DEFAULT_OPTIONS = {
|
|
|
13
13
|
};
|
|
14
14
|
function mySqlTypeCast(field, next) {
|
|
15
15
|
if (field.type == 'TINY' && field.length == 1) { // Boolean
|
|
16
|
-
|
|
16
|
+
let value = field.string();
|
|
17
17
|
if (value == '1')
|
|
18
18
|
return true;
|
|
19
19
|
if (value == '0')
|
|
@@ -21,16 +21,14 @@ function mySqlTypeCast(field, next) {
|
|
|
21
21
|
return null;
|
|
22
22
|
}
|
|
23
23
|
else if (field.type == 'JSON') {
|
|
24
|
-
|
|
24
|
+
let value = field.string();
|
|
25
25
|
return value == null ? null : JSON.parse(value);
|
|
26
26
|
}
|
|
27
27
|
return next();
|
|
28
28
|
}
|
|
29
|
-
function createQueryProcessor(client, _options, engine) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
var options = Object.assign({}, DEFAULT_OPTIONS, _options);
|
|
33
|
-
var queryOptions = {
|
|
29
|
+
function createQueryProcessor(client, _options = {}, engine = 'pg') {
|
|
30
|
+
let options = Object.assign({}, DEFAULT_OPTIONS, _options);
|
|
31
|
+
let queryOptions = {
|
|
34
32
|
lineBreak: options.lineBreaks ? '\n' : ' ',
|
|
35
33
|
nameEscape: _options.identifierQuote || (engine === 'mysql' ? '`' : '"')
|
|
36
34
|
};
|
|
@@ -55,16 +53,16 @@ function createQueryProcessor(client, _options, engine) {
|
|
|
55
53
|
// }, cb);
|
|
56
54
|
// } else throw new Error('Unknown DB engine: ' + engine);
|
|
57
55
|
// }
|
|
58
|
-
return
|
|
56
|
+
return (query) => {
|
|
59
57
|
if (options.parameterized) {
|
|
60
|
-
|
|
58
|
+
let { sql, params } = (0, parameterized_converter_1.convertQueryToParameterizedSQL)(query, queryOptions, engine);
|
|
61
59
|
// if (Helpers.isWebSQL || Helpers.isNode) {
|
|
62
60
|
return client.query(sql, params);
|
|
63
61
|
// }
|
|
64
62
|
// return processSql(query, sql, params, (sql: string, params: any[], cb: any) => executeSql(sql, params, cb));
|
|
65
63
|
}
|
|
66
64
|
else {
|
|
67
|
-
|
|
65
|
+
let sql = (0, sql_converter_1.convertQueryToSQL)(query, queryOptions, engine);
|
|
68
66
|
// if (Helpers.isWebSQL || Helpers.isNode) {
|
|
69
67
|
return client.query(sql, undefined);
|
|
70
68
|
// }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-processor.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAwCA,oDAgDC;AAxFD,
|
|
1
|
+
{"version":3,"file":"query-processor.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-type-sql/src/lib/client/query-processor.ts"],"names":[],"mappings":";;AAwCA,oDAgDC;AAxFD,2CAAwC;AACxC,kFAAsF;AACtF,8DAA+D;AAM/D,MAAM,GAAG,GAAG,gBAAG,CAAC,MAAM,CAAC,iBAAiB,CAEvC,CAAA;AAUD,MAAM,eAAe,GAA0B;IAC7C,UAAU,EAAE,KAAK;IACjB,aAAa,EAAE,IAAI;IACnB,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,GAAG;CACrB,CAAC;AAEF,SAAS,aAAa,CAAC,KAAU,EAAE,IAAS;IAC1C,IAAI,KAAK,CAAC,IAAI,IAAI,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,UAAU;QACzD,IAAI,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,IAAI,GAAG;YAAE,OAAO,IAAI,CAAC;QAC9B,IAAI,KAAK,IAAI,GAAG;YAAE,OAAO,KAAK,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;QAChC,IAAI,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC3B,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,IAAI,EAAE,CAAC;AAChB,CAAC;AAED,SAAgB,oBAAoB,CAAC,MAAW,EAAE,WAAkC,EAAE,EAAE,SAAsB,IAAI;IAEhH,IAAI,OAAO,GAA0B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC;IAElF,IAAI,YAAY,GAAqB;QACnC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG;QAC1C,UAAU,EAAE,QAAQ,CAAC,eAAe,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;KACzE,CAAC;IAEF,yGAAyG;IACzG,qCAAqC;IACrC,qDAAqD;IAErD,8CAA8C;IAC9C,yDAAyD;IACzD,8BAA8B;IAC9B,4DAA4D;IAC5D,UAAU;IACV,QAAQ;IACR,IAAI;IAEJ,yEAAyE;IACzE,2BAA2B;IAC3B,gEAAgE;IAChE,qCAAqC;IACrC,qBAAqB;IACrB,aAAa;IACb,wBAAwB;IACxB,gCAAgC;IAChC,cAAc;IACd,4DAA4D;IAC5D,IAAI;IAEJ,OAAO,CAAC,KAAU,EAAE,EAAE;QACpB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC1B,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAA,wDAA8B,EAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;YAClF,4CAA4C;YAC5C,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACjC,IAAI;YACJ,+GAA+G;QACjH,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,GAAG,IAAA,iCAAiB,EAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;YACzD,4CAA4C;YAC5C,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACpC,IAAI;YACJ,yHAAyH;QAC3H,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -6,18 +6,18 @@ function convertSubstitutionParam(param) {
|
|
|
6
6
|
if (param == null)
|
|
7
7
|
return 'NULL';
|
|
8
8
|
if (typeof param === 'string' || param instanceof String) {
|
|
9
|
-
return
|
|
9
|
+
return `'${String(param)}'`;
|
|
10
10
|
}
|
|
11
11
|
else if (typeof param === 'boolean' || param instanceof Boolean) {
|
|
12
12
|
return String(param).toUpperCase();
|
|
13
13
|
}
|
|
14
14
|
else if (param instanceof Date) {
|
|
15
|
-
return
|
|
15
|
+
return `'${param.toISOString()}'`;
|
|
16
16
|
}
|
|
17
17
|
else if (typeof param === 'number' || param instanceof Number) {
|
|
18
18
|
return String(param);
|
|
19
19
|
}
|
|
20
|
-
return
|
|
20
|
+
return `'${JSON.stringify(param)}'`;
|
|
21
21
|
}
|
|
22
22
|
// node mysql doesn't have an typeCast equivalent solution for the other direction
|
|
23
23
|
// node-postgres: https://github.com/brianc/node-postgres/issues/442
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"param-converter.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AACA,4DAYC;AAID,kDAMC;AAtBD,SAAgB,wBAAwB,CAAC,KAAU;IAC/C,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,MAAM,CAAC;IACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;QACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"param-converter.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-type-sql/src/lib/converter/param-converter.ts"],"names":[],"mappings":";;AACA,4DAYC;AAID,kDAMC;AAtBD,SAAgB,wBAAwB,CAAC,KAAU;IAC/C,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,MAAM,CAAC;IACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;QACvD,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;IAChC,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,YAAY,OAAO,EAAE,CAAC;QAChE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IACvC,CAAC;SAAM,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QAC/B,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC;IACtC,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;QAC9D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC;AACxC,CAAC;AAED,kFAAkF;AAClF,oEAAoE;AACpE,SAAgB,mBAAmB,CAAC,KAAU;IAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,KAAK,YAAY,MAAM,IAAI,KAAK,YAAY,MAAM;QAClG,KAAK,YAAY,OAAO,IAAI,KAAK,YAAY,IAAI,CAAC,EAAE,CAAC;QACrD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertQueryToParameterizedSQL = convertQueryToParameterizedSQL;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
const query_converter_1 = require("./query-converter");
|
|
5
|
+
const param_converter_1 = require("./param-converter");
|
|
6
|
+
let pgParamConverter = (index) => '$' + index;
|
|
7
|
+
let mySqlParamConverter = (index) => '?';
|
|
8
8
|
function convertSingleParam(param, params, paramConverter) {
|
|
9
9
|
params.push((0, param_converter_1.convertEscapedParam)(param));
|
|
10
10
|
return paramConverter(params.length);
|
|
11
11
|
}
|
|
12
12
|
function convertQueryToParameterizedSQL(query, options, engine) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
return { sql
|
|
13
|
+
let params = [];
|
|
14
|
+
let paramConverter = engine === 'mysql' ? mySqlParamConverter : pgParamConverter;
|
|
15
|
+
let sql = (0, query_converter_1.createQueryConverter)((param) => convertSingleParam(param, params, paramConverter), options, engine)(query);
|
|
16
|
+
return { sql, params };
|
|
17
17
|
}
|
|
18
18
|
//# sourceMappingURL=parameterized-converter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameterized-converter.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAYA,wEAOC;AAnBD,
|
|
1
|
+
{"version":3,"file":"parameterized-converter.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-type-sql/src/lib/converter/parameterized-converter.ts"],"names":[],"mappings":";;AAYA,wEAOC;AAnBD,uDAAuD;AACvD,uDAAsD;AAGtD,IAAI,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC;AACtD,IAAI,mBAAmB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,CAAC;AAEjD,SAAS,kBAAkB,CAAC,KAAU,EAAE,MAAa,EAAE,cAAsC;IACzF,MAAM,CAAC,IAAI,CAAC,IAAA,qCAAmB,EAAC,KAAK,CAAC,CAAC,CAAC;IACxC,OAAO,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,8BAA8B,CAAC,KAAU,EAAE,OAAyB,EAAE,MAAmB;IACrG,IAAI,MAAM,GAAU,EAAE,CAAC;IAEvB,IAAI,cAAc,GAAG,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,CAAC;IACjF,IAAI,GAAG,GAAG,IAAA,sCAAoB,EAAC,CAAC,KAAU,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;IAE1H,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;AAC3B,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createQueryConverter = createQueryConverter;
|
|
4
|
-
|
|
4
|
+
const type_converter_1 = require("./type-converter");
|
|
5
5
|
function createQueryConverter(paramConverter, options, engine) {
|
|
6
6
|
return convertQuery;
|
|
7
7
|
function convertQuery(query) {
|
|
@@ -16,35 +16,35 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
16
16
|
throw new Error('Unknown query type:' + query._action);
|
|
17
17
|
}
|
|
18
18
|
function convertDeleteQuery(query) {
|
|
19
|
-
|
|
19
|
+
let s = 'DELETE FROM ' + convertTable(query._table);
|
|
20
20
|
s += convertConditions(query._conditions);
|
|
21
21
|
return s;
|
|
22
22
|
}
|
|
23
23
|
function convertUpdateQuery(query) {
|
|
24
|
-
|
|
24
|
+
let s = 'UPDATE ' + convertTable(query._table) + ' SET ';
|
|
25
25
|
s += convertUpdateSetters(query._table, query._entity);
|
|
26
26
|
s += convertConditions(query._conditions);
|
|
27
27
|
return s;
|
|
28
28
|
}
|
|
29
29
|
function convertUpdateSetters(table, entity) {
|
|
30
|
-
return Object.keys(entity).sort().map(
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
return Object.keys(entity).sort().map(key => {
|
|
31
|
+
let value = entity[key];
|
|
32
|
+
let column = table[key];
|
|
33
33
|
return convertColumnName(column) + ' = ' + convertParam(column, value);
|
|
34
34
|
}).join(', ');
|
|
35
35
|
}
|
|
36
36
|
function convertInsertQuery(query) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
Object.keys(item).forEach(
|
|
37
|
+
let items = Array.isArray(query._entity) ? query._entity : [query._entity];
|
|
38
|
+
let keySet = items.reduce((set, item) => {
|
|
39
|
+
Object.keys(item).forEach(key => set.add(key));
|
|
40
40
|
return set;
|
|
41
41
|
}, new Set());
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
s += '(' + keys.map(
|
|
42
|
+
let keys = Array.from(keySet).sort();
|
|
43
|
+
let s = 'INSERT INTO ' + convertTable(query._table) + ' ';
|
|
44
|
+
s += '(' + keys.map(key => convertColumnName(query._table[key])).join(', ') + ')';
|
|
45
45
|
s += options.lineBreak + 'VALUES ';
|
|
46
|
-
s += items.map(
|
|
47
|
-
.map(
|
|
46
|
+
s += items.map(item => convertInsertItem(query._table, item, keys))
|
|
47
|
+
.map((row) => '(' + row + ')').join(', ');
|
|
48
48
|
s += getPgInsertReturningIfNeeded(query);
|
|
49
49
|
return s;
|
|
50
50
|
}
|
|
@@ -56,14 +56,14 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
56
56
|
return '';
|
|
57
57
|
}
|
|
58
58
|
function convertInsertItem(table, entity, keys) {
|
|
59
|
-
return keys.map(
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
return keys.map(key => {
|
|
60
|
+
let value = entity[key];
|
|
61
|
+
let column = table[key];
|
|
62
62
|
return convertParam(column, value);
|
|
63
63
|
}).join(', ');
|
|
64
64
|
}
|
|
65
65
|
function convertSelectQuery(query) {
|
|
66
|
-
|
|
66
|
+
let s = 'SELECT ';
|
|
67
67
|
if (query._distinct) {
|
|
68
68
|
s += 'DISTINCT ';
|
|
69
69
|
}
|
|
@@ -71,11 +71,11 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
71
71
|
s += '*';
|
|
72
72
|
}
|
|
73
73
|
else {
|
|
74
|
-
s += query._columns.map(
|
|
74
|
+
s += query._columns.map((column) => convertColumn(column)).join(', ');
|
|
75
75
|
}
|
|
76
76
|
s += options.lineBreak + 'FROM ';
|
|
77
77
|
if (query._tables) {
|
|
78
|
-
s += query._tables.map(
|
|
78
|
+
s += query._tables.map((table) => table._parent ? convertJoin(table) : convertTable(table)).join(', ');
|
|
79
79
|
}
|
|
80
80
|
else {
|
|
81
81
|
s += convertTable(query._table);
|
|
@@ -83,12 +83,12 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
83
83
|
s += convertConditions(query._conditions);
|
|
84
84
|
if (query._groupBy && query._groupBy.length > 0) {
|
|
85
85
|
s += options.lineBreak + 'GROUP BY ';
|
|
86
|
-
s += query._groupBy.map(
|
|
86
|
+
s += query._groupBy.map((column) => convertColumn(column)).join(', ');
|
|
87
87
|
}
|
|
88
88
|
s += convertConditions(query._having, 'HAVING');
|
|
89
89
|
if (query._orderings && query._orderings.length > 0) {
|
|
90
90
|
s += options.lineBreak + 'ORDER BY ';
|
|
91
|
-
s += query._orderings.map(
|
|
91
|
+
s += query._orderings.map((ordering) => convertOrdering(ordering)).join(', ');
|
|
92
92
|
}
|
|
93
93
|
if (query._limit != null) {
|
|
94
94
|
s += options.lineBreak + 'LIMIT ' + (0, type_converter_1.number)(query._limit);
|
|
@@ -98,29 +98,28 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
98
98
|
}
|
|
99
99
|
return s;
|
|
100
100
|
}
|
|
101
|
-
function convertConditions(conditions, keyword) {
|
|
102
|
-
|
|
103
|
-
var s = '';
|
|
101
|
+
function convertConditions(conditions, keyword = 'WHERE') {
|
|
102
|
+
let s = '';
|
|
104
103
|
if (conditions && conditions.length > 0) {
|
|
105
104
|
s += options.lineBreak + keyword + ' ';
|
|
106
105
|
preprocessConditions(conditions);
|
|
107
|
-
s += conditions.map(
|
|
106
|
+
s += conditions.map(condition => convertCondition(condition, true)).join(' AND ');
|
|
108
107
|
}
|
|
109
108
|
return s;
|
|
110
109
|
}
|
|
111
110
|
function convertJoin(joinChain) {
|
|
112
|
-
|
|
111
|
+
let items = [];
|
|
113
112
|
while (joinChain) {
|
|
114
113
|
items.push(joinChain);
|
|
115
114
|
joinChain = joinChain._parent;
|
|
116
115
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
for (
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
116
|
+
let root = items[items.length - 1];
|
|
117
|
+
let s = convertTable(root);
|
|
118
|
+
for (let i = items.length - 2; i >= 0; i -= 2) {
|
|
119
|
+
let table = items[i]._table;
|
|
120
|
+
let modifier = items[i]._modifier;
|
|
121
|
+
let condition = items[i - 1]._condition;
|
|
122
|
+
let param = convertColumn(condition._otherColumn);
|
|
124
123
|
s += ' ' + modifier.toUpperCase() + ' JOIN ' + convertTable(table) + ' ON ' +
|
|
125
124
|
convertColumnCondition(condition, param);
|
|
126
125
|
}
|
|
@@ -128,7 +127,7 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
128
127
|
}
|
|
129
128
|
function convertOrdering(ordering) {
|
|
130
129
|
if (ordering._column) {
|
|
131
|
-
|
|
130
|
+
let s = convertColumn(ordering._column);
|
|
132
131
|
if (ordering._nullsPosition != null) { // "NULLS FIRST" only exists in PG, this is the general solution
|
|
133
132
|
s += ' IS NULL ' + (ordering._nullsPosition === 'FIRST' ? 'DESC' : 'ASC') + ', ' + s;
|
|
134
133
|
}
|
|
@@ -146,7 +145,7 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
146
145
|
return options.nameEscape + table._$name + options.nameEscape;
|
|
147
146
|
}
|
|
148
147
|
function convertColumn(column) {
|
|
149
|
-
|
|
148
|
+
let s = '';
|
|
150
149
|
if (!(column._name === '*' && column._modifiers.length > 0 && column._modifiers[0].name === 'count')) {
|
|
151
150
|
s += convertTable(column._table) + '.';
|
|
152
151
|
}
|
|
@@ -155,8 +154,8 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
155
154
|
}
|
|
156
155
|
function convertColumnModifiers(s, column) {
|
|
157
156
|
if (column._modifiers) {
|
|
158
|
-
column._modifiers.forEach(
|
|
159
|
-
|
|
157
|
+
column._modifiers.forEach((modifier) => {
|
|
158
|
+
let name = modifier.name;
|
|
160
159
|
if (name === 'lower')
|
|
161
160
|
s = 'LOWER(' + s + ')';
|
|
162
161
|
else if (name === 'upper')
|
|
@@ -180,11 +179,11 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
180
179
|
function convertColumnName(column) {
|
|
181
180
|
if (column._name === '*')
|
|
182
181
|
return column._name;
|
|
183
|
-
|
|
182
|
+
let name = typeof column._name === 'string' ? column._name : column._name.name;
|
|
184
183
|
return options.nameEscape + name + options.nameEscape;
|
|
185
184
|
}
|
|
186
185
|
function preprocessConditions(conditions) {
|
|
187
|
-
conditions.forEach(
|
|
186
|
+
conditions.forEach(condition => {
|
|
188
187
|
if (conditions.length > 1 && condition._sibling) {
|
|
189
188
|
condition._parenthesis = true;
|
|
190
189
|
}
|
|
@@ -203,12 +202,11 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
203
202
|
preprocessParams(condition._child);
|
|
204
203
|
}
|
|
205
204
|
}
|
|
206
|
-
function convertCondition(condition, root) {
|
|
207
|
-
if (root === void 0) { root = false; }
|
|
205
|
+
function convertCondition(condition, root = false) {
|
|
208
206
|
if (!condition._sibling && !condition._child) {
|
|
209
207
|
return convertColumnCondition(condition, condition.__param);
|
|
210
208
|
}
|
|
211
|
-
|
|
209
|
+
let s = '';
|
|
212
210
|
if (condition._child) {
|
|
213
211
|
s += convertCondition(condition._child);
|
|
214
212
|
}
|
|
@@ -224,7 +222,7 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
224
222
|
return s;
|
|
225
223
|
}
|
|
226
224
|
function convertColumnCondition(condition, param) {
|
|
227
|
-
|
|
225
|
+
let s = convertColumn(condition._column);
|
|
228
226
|
s += getConditionString(condition, param);
|
|
229
227
|
return s;
|
|
230
228
|
}
|
|
@@ -248,20 +246,20 @@ function createQueryConverter(paramConverter, options, engine) {
|
|
|
248
246
|
}
|
|
249
247
|
}
|
|
250
248
|
function getConditionParam(condition) {
|
|
251
|
-
|
|
249
|
+
let param = '';
|
|
252
250
|
if (condition._otherColumn) {
|
|
253
251
|
param = convertColumn(condition._otherColumn);
|
|
254
252
|
}
|
|
255
253
|
else {
|
|
256
|
-
|
|
254
|
+
let _convertParam = (param) => convertParam(condition._column, param);
|
|
257
255
|
if (condition._type === 'in' || condition._type === 'not-in') {
|
|
258
|
-
param = condition._values.map(
|
|
256
|
+
param = condition._values.map((value) => _convertParam(value)).join(', ');
|
|
259
257
|
}
|
|
260
258
|
else if (condition._type === 'between' || condition._type === 'not-between') {
|
|
261
|
-
param =
|
|
259
|
+
param = _convertParam(condition._values[0]) + ' AND ' + _convertParam(condition._values[1]);
|
|
262
260
|
}
|
|
263
261
|
else if (condition._type !== 'is-null' && condition._type !== 'is-not-null') {
|
|
264
|
-
param =
|
|
262
|
+
param = _convertParam(condition._values[0]);
|
|
265
263
|
}
|
|
266
264
|
}
|
|
267
265
|
return param;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-converter.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"query-converter.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-type-sql/src/lib/converter/query-converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertResult = convertResult;
|
|
4
4
|
function convertResult(query, result, engine) {
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
let rows = engine === 'pg' ? result.rows : result;
|
|
6
|
+
let rowCount = engine === 'pg' ? result.rowCount : result.affectedRows || result.changedRows;
|
|
7
7
|
if (query._action === 'select')
|
|
8
8
|
return convertSelectResult(query, rows);
|
|
9
9
|
if (query._action === 'delete')
|
|
@@ -18,7 +18,7 @@ function convertInsertResult(result, engine) {
|
|
|
18
18
|
if (engine === 'mysql')
|
|
19
19
|
return result.insertId > 0 ? result.insertId : undefined; // mysql returns 0 for tables that have a non-autoincrement ID
|
|
20
20
|
if (engine === 'pg' && result.rows && result.rows.length === 1) {
|
|
21
|
-
|
|
21
|
+
let columnName = Object.keys(result.rows[0])[0];
|
|
22
22
|
return result.rows[0][columnName];
|
|
23
23
|
}
|
|
24
24
|
}
|
|
@@ -27,10 +27,10 @@ function convertSelectResult(query, rows) {
|
|
|
27
27
|
!(query._columns[0]._name === '*' && query._columns[0]._modifiers.length === 0)) {
|
|
28
28
|
if (rows.length == 0)
|
|
29
29
|
return [];
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
if (query._columns[0]._name === '*' && query._columns[0]._modifiers.some(
|
|
33
|
-
return values.map(
|
|
30
|
+
let columnName = Object.keys(rows[0])[0]; // easier than reverse engineering from the column modifiers
|
|
31
|
+
let values = rows.map((row) => row[columnName]);
|
|
32
|
+
if (query._columns[0]._name === '*' && query._columns[0]._modifiers.some((m) => m.name === 'count')) {
|
|
33
|
+
return values.map((value) => Number(value)); // string to number conversion for PG count values
|
|
34
34
|
}
|
|
35
35
|
return values;
|
|
36
36
|
}
|
|
@@ -40,11 +40,11 @@ function convertSelectResult(query, rows) {
|
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
function convertAliasFields(query, rows) {
|
|
43
|
-
|
|
43
|
+
let aliasByName = getColumnAliasesByName(query);
|
|
44
44
|
if (Object.keys(aliasByName).length === 0)
|
|
45
45
|
return;
|
|
46
|
-
rows.forEach(
|
|
47
|
-
Object.keys(row).forEach(
|
|
46
|
+
rows.forEach((row) => {
|
|
47
|
+
Object.keys(row).forEach((name) => {
|
|
48
48
|
if (aliasByName[name]) {
|
|
49
49
|
row[aliasByName[name]] = row[name];
|
|
50
50
|
delete row[name];
|
|
@@ -53,28 +53,28 @@ function convertAliasFields(query, rows) {
|
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
55
|
function getColumnAliasesByName(query) {
|
|
56
|
-
|
|
56
|
+
let aliasByName = {};
|
|
57
57
|
if (query._columns && query._columns.length > 0) {
|
|
58
|
-
query._columns.forEach(
|
|
58
|
+
query._columns.forEach((column) => {
|
|
59
59
|
if (column._name && column._name.alias && column._modifiers.length === 0) {
|
|
60
60
|
aliasByName[column._name.name] = column._name.alias;
|
|
61
61
|
}
|
|
62
62
|
else if (column._name === '*' && column._modifiers.length === 0) {
|
|
63
|
-
getAliasColumnsOfTable(column._table).forEach(
|
|
63
|
+
getAliasColumnsOfTable(column._table).forEach((column) => {
|
|
64
64
|
aliasByName[column._name.name] = column._name.alias;
|
|
65
65
|
});
|
|
66
66
|
}
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
else {
|
|
70
|
-
|
|
71
|
-
tables.forEach(
|
|
72
|
-
getAliasColumnsOfTable(table).forEach(
|
|
70
|
+
let tables = query._table ? [query._table] : query._tables;
|
|
71
|
+
tables.forEach((table) => {
|
|
72
|
+
getAliasColumnsOfTable(table).forEach((column) => {
|
|
73
73
|
aliasByName[column._name.name] = column._name.alias;
|
|
74
74
|
});
|
|
75
|
-
|
|
75
|
+
let joinTable = table._parent;
|
|
76
76
|
while (joinTable) {
|
|
77
|
-
getAliasColumnsOfTable(joinTable).forEach(
|
|
77
|
+
getAliasColumnsOfTable(joinTable).forEach((column) => {
|
|
78
78
|
aliasByName[column._name.name] = column._name.alias;
|
|
79
79
|
});
|
|
80
80
|
joinTable = joinTable._parent;
|
|
@@ -84,6 +84,6 @@ function getColumnAliasesByName(query) {
|
|
|
84
84
|
return aliasByName;
|
|
85
85
|
}
|
|
86
86
|
function getAliasColumnsOfTable(table) {
|
|
87
|
-
return Object.keys(table).map(
|
|
87
|
+
return Object.keys(table).map(key => table[key]).filter((column) => column && column._name && column._name.alias);
|
|
88
88
|
}
|
|
89
89
|
//# sourceMappingURL=result-converter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"result-converter.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAEA,sCASC;AATD,SAAgB,aAAa,CAAC,KAAU,EAAE,MAAW,EAAE,MAAmB;IACxE,IAAI,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IAClD,IAAI,QAAQ,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,WAAW,CAAC;IAE7F,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACxE,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAChD,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAChD,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3E,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAW,EAAE,MAAmB;IAC3D,IAAI,MAAM,KAAK,OAAO;QAAE,OAAO,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,8DAA8D;IAChJ,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/D,IAAI,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAU,EAAE,IAAW;IAClD,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;QAC/C,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;QAClF,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QAChC,IAAI,
|
|
1
|
+
{"version":3,"file":"result-converter.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-type-sql/src/lib/converter/result-converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertQueryToSQL = convertQueryToSQL;
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
const query_converter_1 = require("./query-converter");
|
|
5
|
+
const param_converter_1 = require("./param-converter");
|
|
6
6
|
function convertQueryToSQL(query, options, engine) {
|
|
7
|
-
return (0, query_converter_1.createQueryConverter)(
|
|
7
|
+
return (0, query_converter_1.createQueryConverter)((param) => (0, param_converter_1.convertSubstitutionParam)(param), options, engine)(query);
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=sql-converter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-converter.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAIA,8CAEC;AAND,
|
|
1
|
+
{"version":3,"file":"sql-converter.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-type-sql/src/lib/converter/sql-converter.ts"],"names":[],"mappings":";;AAIA,8CAEC;AAND,uDAAuD;AACvD,uDAA2D;AAG3D,SAAgB,iBAAiB,CAAC,KAAU,EAAE,OAAyB,EAAE,MAAmB;IACxF,OAAO,IAAA,sCAAoB,EAAC,CAAC,KAAU,EAAE,EAAE,CAAC,IAAA,0CAAwB,EAAC,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;AACzG,CAAC"}
|
|
@@ -5,7 +5,7 @@ exports.boolean = boolean;
|
|
|
5
5
|
exports.date = date;
|
|
6
6
|
exports.string = string;
|
|
7
7
|
function number(param) {
|
|
8
|
-
|
|
8
|
+
let result = Number(param);
|
|
9
9
|
if (Number.isNaN(result))
|
|
10
10
|
throw new Error('Invalid number parameter in SQL query: ' + param);
|
|
11
11
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-converter.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AACA,wBAIC;AAED,0BAMC;AAED,oBAQC;AAED,wBAIC;AA5BD,SAAgB,MAAM,CAAC,KAAU;IAC/B,IAAI,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,KAAK,CAAC,CAAC;IAC7F,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,OAAO,CAAC,KAAU;IAChC,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC7C,IAAI,KAAK,YAAY,OAAO;QAAE,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IACrD,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IAClC,IAAI,KAAK,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IACpC,MAAM,IAAI,KAAK,CAAC,0CAA0C,GAAG,KAAK,CAAC,CAAC;AACtE,CAAC;AAED,SAAgB,IAAI,CAAC,KAAU;IAC7B,IAAI,KAAK,YAAY,IAAI;QAAE,OAAO,KAAK,CAAC,CAAC,aAAa;IACtD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,MAAM;QAAE,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACjF,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;QACzD,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,GAAG,KAAK,CAAC,CAAC,CAAC,aAAa;QAC5H,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,uCAAuC,GAAG,KAAK,CAAC,CAAC;AACnE,CAAC;AAED,SAAgB,MAAM,CAAC,KAAU;IAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,KAAK,YAAY,MAAM;QAAE,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IACpD,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,KAAK,CAAC,CAAC;AACrE,CAAC"}
|
|
1
|
+
{"version":3,"file":"type-converter.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-type-sql/src/lib/converter/type-converter.ts"],"names":[],"mappings":";;AACA,wBAIC;AAED,0BAMC;AAED,oBAQC;AAED,wBAIC;AA5BD,SAAgB,MAAM,CAAC,KAAU;IAC/B,IAAI,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,KAAK,CAAC,CAAC;IAC7F,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,OAAO,CAAC,KAAU;IAChC,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC7C,IAAI,KAAK,YAAY,OAAO;QAAE,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IACrD,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IAClC,IAAI,KAAK,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IACpC,MAAM,IAAI,KAAK,CAAC,0CAA0C,GAAG,KAAK,CAAC,CAAC;AACtE,CAAC;AAED,SAAgB,IAAI,CAAC,KAAU;IAC7B,IAAI,KAAK,YAAY,IAAI;QAAE,OAAO,KAAK,CAAC,CAAC,aAAa;IACtD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,MAAM;QAAE,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACjF,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;QACzD,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,GAAG,KAAK,CAAC,CAAC,CAAC,aAAa;QAC5H,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,uCAAuC,GAAG,KAAK,CAAC,CAAC;AACnE,CAAC;AAED,SAAgB,MAAM,CAAC,KAAU;IAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,KAAK,YAAY,MAAM;QAAE,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IACpD,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,KAAK,CAAC,CAAC;AACrE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":[""],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-type-sql/src/lib/converter/types.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index._auto-generated_.js","sourceRoot":"","sources":[""],"names":[],"mappings":"AAAA,cAAc;AACd,8CAA8C;AAC9C,2BAA2B;AAC3B,uDAAuD;AACvD,2CAA2C"}
|
|
1
|
+
{"version":3,"file":"index._auto-generated_.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-type-sql/src/lib/index._auto-generated_.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,8CAA8C;AAC9C,2BAA2B;AAC3B,uDAAuD;AACvD,2CAA2C"}
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":[""],"names":[],"mappings":";AACA,WAAW;;;AAEX,8DAAuE;AAA9D,2GAAA,OAAO,OAAe;AAC/B,kEAA2E;AAAlE,+GAAA,OAAO,OAAiB;AACjC,wEAAiF;AAAxE,qHAAA,OAAO,OAAoB;AACpC,4DAAqE;AAA5D,yGAAA,OAAO,OAAc;AAC9B,gEAAyE;AAAhE,6GAAA,OAAO,OAAgB;AAChC,8DAAuE;AAA9D,2GAAA,OAAO,OAAe;AAC/B,gEAAyE;AAAhE,6GAAA,OAAO,OAAgB;AAChC,8DAAuE;AAA9D,2GAAA,OAAO,OAAe;AAE/B,qFAA6F;AAApF,8HAAA,OAAO,OAAwB;AACxC,uEAAgF;AAAvE,iHAAA,OAAO,OAAkB;AAClC,mFAA2F;AAAlF,4HAAA,OAAO,OAAuB;AACvC,iFAAyF;AAAhF,0HAAA,OAAO,OAAsB;AAEtC,8DAAuE;AAA9D,6GAAA,OAAO,OAAgB;AAChC,0EAAkF;AAAzE,wHAAA,OAAO,OAAqB;AAErC,iEAA0E;AAAjE,+GAAA,OAAO,OAAiB;AAEjC,6DAAsE;AAA7D,2GAAA,OAAO,OAAe;AAC/B,2DAAoE;AAA3D,yGAAA,OAAO,OAAc;AAC9B,+EAAuF;AAA9E,4HAAA,OAAO,OAAuB;AAEvC,uDAAgE;AAAvD,2GAAA,OAAO,OAAe;AAC/B,qDAA8D;AAArD,yGAAA,OAAO,OAAc;AAE9B,UAAU;AAEV,wCAA6D;AAApD,yGAAA,OAAO,OAAoB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-type-sql/src/lib/index.ts"],"names":[],"mappings":";AACA,WAAW;;;AAEX,8DAAuE;AAA9D,2GAAA,OAAO,OAAe;AAC/B,kEAA2E;AAAlE,+GAAA,OAAO,OAAiB;AACjC,wEAAiF;AAAxE,qHAAA,OAAO,OAAoB;AACpC,4DAAqE;AAA5D,yGAAA,OAAO,OAAc;AAC9B,gEAAyE;AAAhE,6GAAA,OAAO,OAAgB;AAChC,8DAAuE;AAA9D,2GAAA,OAAO,OAAe;AAC/B,gEAAyE;AAAhE,6GAAA,OAAO,OAAgB;AAChC,8DAAuE;AAA9D,2GAAA,OAAO,OAAe;AAE/B,qFAA6F;AAApF,8HAAA,OAAO,OAAwB;AACxC,uEAAgF;AAAvE,iHAAA,OAAO,OAAkB;AAClC,mFAA2F;AAAlF,4HAAA,OAAO,OAAuB;AACvC,iFAAyF;AAAhF,0HAAA,OAAO,OAAsB;AAEtC,8DAAuE;AAA9D,6GAAA,OAAO,OAAgB;AAChC,0EAAkF;AAAzE,wHAAA,OAAO,OAAqB;AAErC,iEAA0E;AAAjE,+GAAA,OAAO,OAAiB;AAEjC,6DAAsE;AAA7D,2GAAA,OAAO,OAAe;AAC/B,2DAAoE;AAA3D,yGAAA,OAAO,OAAc;AAC9B,+EAAuF;AAA9E,4HAAA,OAAO,OAAuB;AAEvC,uDAAgE;AAAvD,2GAAA,OAAO,OAAe;AAC/B,qDAA8D;AAArD,yGAAA,OAAO,OAAc;AAE9B,UAAU;AAEV,wCAA6D;AAApD,yGAAA,OAAO,OAAoB"}
|