drizzle-orm 0.10.46 → 0.11.1
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 +50 -58
- package/{src/builders → builders}/aggregators/abstractAggregator.d.ts +0 -0
- package/{src/builders → builders}/aggregators/abstractAggregator.js +1 -1
- package/{src/builders → builders}/aggregators/deleteAggregator.d.ts +0 -0
- package/{src/builders → builders}/aggregators/deleteAggregator.js +0 -0
- package/{src/builders → builders}/aggregators/insertAggregator.d.ts +0 -0
- package/{src/builders → builders}/aggregators/insertAggregator.js +0 -0
- package/{src/builders → builders}/aggregators/selectAggregator.d.ts +2 -8
- package/builders/aggregators/selectAggregator.js +110 -0
- package/builders/aggregators/selectAggregatorV1.d.ts +39 -0
- package/{src/builders/aggregators/selectAggregator.js → builders/aggregators/selectAggregatorV1.js} +3 -3
- package/{src/builders → builders}/aggregators/updateAggregator.d.ts +0 -0
- package/{src/builders → builders}/aggregators/updateAggregator.js +0 -0
- package/{src/builders → builders}/highLvlBuilders/abstractRequestBuilder.d.ts +2 -3
- package/{src/builders → builders}/highLvlBuilders/abstractRequestBuilder.js +0 -0
- package/{src/builders → builders}/highLvlBuilders/deleteRequestBuilder.d.ts +0 -0
- package/{src/builders → builders}/highLvlBuilders/deleteRequestBuilder.js +0 -0
- package/{src/builders → builders}/highLvlBuilders/insertRequestBuilder.d.ts +0 -0
- package/{src/builders → builders}/highLvlBuilders/insertRequestBuilder.js +0 -0
- package/builders/highLvlBuilders/joins/joinBuilderResponse.d.ts +8 -0
- package/builders/highLvlBuilders/joins/joinBuilderResponse.js +16 -0
- package/builders/highLvlBuilders/joins/proxies/joinProxies.d.ts +16 -0
- package/builders/highLvlBuilders/joins/proxies/joinProxies.js +47 -0
- package/builders/highLvlBuilders/joins/selectJoinBuilder.d.ts +44 -0
- package/builders/highLvlBuilders/joins/selectJoinBuilder.js +113 -0
- package/{src/builders → builders}/highLvlBuilders/order.d.ts +0 -0
- package/{src/builders → builders}/highLvlBuilders/order.js +0 -0
- package/builders/highLvlBuilders/selectRequestBuilder.d.ts +63 -0
- package/{src/builders → builders}/highLvlBuilders/selectRequestBuilder.js +45 -6
- package/{src/builders → builders}/highLvlBuilders/updateRequestBuilder.d.ts +0 -0
- package/{src/builders → builders}/highLvlBuilders/updateRequestBuilder.js +0 -0
- package/{src/builders → builders}/index.d.ts +3 -0
- package/{src/builders → builders}/index.js +15 -1
- package/{src/builders → builders}/joinBuilders/builders/abstractJoinBuilder.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/builders/abstractJoinBuilder.js +1 -1
- package/{src/builders → builders}/joinBuilders/builders/selectWithFiveJoins.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/builders/selectWithFiveJoins.js +0 -0
- package/{src/builders → builders}/joinBuilders/builders/selectWithFourJoins.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/builders/selectWithFourJoins.js +0 -0
- package/{src/builders → builders}/joinBuilders/builders/selectWithJoin.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/builders/selectWithJoin.js +0 -0
- package/{src/builders → builders}/joinBuilders/builders/selectWithThreeJoins.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/builders/selectWithThreeJoins.js +0 -0
- package/{src/builders → builders}/joinBuilders/builders/selectWithTwoJoins.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/builders/selectWithTwoJoins.js +0 -0
- package/{src/builders → builders}/joinBuilders/join.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/join.js +0 -0
- package/{src/builders → builders}/joinBuilders/joinWith.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/joinWith.js +0 -0
- package/{src/builders → builders}/joinBuilders/responses/selectResponseFiveJoins.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/responses/selectResponseFiveJoins.js +0 -0
- package/{src/builders → builders}/joinBuilders/responses/selectResponseFourJoins.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/responses/selectResponseFourJoins.js +0 -0
- package/{src/builders → builders}/joinBuilders/responses/selectResponseThreeJoins.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/responses/selectResponseThreeJoins.js +0 -0
- package/{src/builders → builders}/joinBuilders/responses/selectResponseTwoJoins.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/responses/selectResponseTwoJoins.js +0 -0
- package/{src/builders → builders}/joinBuilders/responses/selectResponseWithJoin.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/responses/selectResponseWithJoin.js +0 -0
- package/{src/builders → builders}/joinBuilders/static.d.ts +0 -0
- package/{src/builders → builders}/joinBuilders/static.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/alter.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/alter.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/create.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/create.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/delets/delete.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/delets/delete.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/delets/deleteFilter.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/delets/deleteFilter.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/delets/deleteFrom.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/delets/deleteFrom.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/inserts/insert.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/inserts/insert.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/inserts/insertInto.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/inserts/insertInto.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/inserts/onConflictInsert.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/inserts/onConflictInsert.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/inserts/valuesInsert.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/inserts/valuesInsert.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/selects/select.d.ts +4 -1
- package/builders/lowLvlBuilders/selects/select.js +42 -0
- package/{src/builders → builders}/lowLvlBuilders/selects/selectFrom.d.ts +25 -8
- package/builders/lowLvlBuilders/selects/selectFrom.js +78 -0
- package/{src/builders → builders}/lowLvlBuilders/selects/selectJoined.d.ts +22 -6
- package/builders/lowLvlBuilders/selects/selectJoined.js +71 -0
- package/{src/builders → builders}/lowLvlBuilders/selects/whereSelect.d.ts +13 -0
- package/{src/builders → builders}/lowLvlBuilders/selects/whereSelect.js +24 -0
- package/{src/builders → builders}/lowLvlBuilders/updates/update.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/updates/update.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/updates/updateIn.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/updates/updateIn.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/updates/whereSelect.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/updates/whereSelect.js +0 -0
- package/{src/builders → builders}/lowLvlBuilders/updates/whereSet.d.ts +0 -0
- package/{src/builders → builders}/lowLvlBuilders/updates/whereSet.js +0 -0
- package/{src/builders → builders}/requestBuilders/updates/combine.d.ts +0 -0
- package/{src/builders → builders}/requestBuilders/updates/combine.js +0 -0
- package/{src/builders → builders}/requestBuilders/updates/increment.d.ts +0 -0
- package/{src/builders → builders}/requestBuilders/updates/increment.js +0 -0
- package/{src/builders → builders}/requestBuilders/updates/setObjects.d.ts +0 -0
- package/{src/builders → builders}/requestBuilders/updates/setObjects.js +0 -0
- package/{src/builders → builders}/requestBuilders/updates/static.d.ts +0 -0
- package/{src/builders → builders}/requestBuilders/updates/static.js +0 -0
- package/{src/builders → builders}/requestBuilders/updates/updates.d.ts +0 -0
- package/{src/builders → builders}/requestBuilders/updates/updates.js +0 -0
- package/{src/builders → builders}/requestBuilders/where/and.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/and.js +19 -2
- package/{src/builders → builders}/requestBuilders/where/const.d.ts +8 -4
- package/{src/builders → builders}/requestBuilders/where/const.js +11 -1
- package/{src/builders → builders}/requestBuilders/where/constArray.d.ts +8 -4
- package/{src/builders → builders}/requestBuilders/where/constArray.js +26 -1
- package/{src/builders → builders}/requestBuilders/where/eqWhere.d.ts +11 -1
- package/{src/builders → builders}/requestBuilders/where/eqWhere.js +8 -3
- package/{src/builders → builders}/requestBuilders/where/greater.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/greater.js +8 -3
- package/{src/builders → builders}/requestBuilders/where/greaterEq.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/greaterEq.js +8 -3
- package/{src/builders → builders}/requestBuilders/where/in.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/in.js +8 -3
- package/{src/builders → builders}/requestBuilders/where/isNotNull.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/isNotNull.js +6 -2
- package/{src/builders → builders}/requestBuilders/where/isNull.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/isNull.js +6 -2
- package/{src/builders → builders}/requestBuilders/where/less.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/less.js +8 -3
- package/{src/builders → builders}/requestBuilders/where/lessEq.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/lessEq.js +8 -3
- package/{src/builders → builders}/requestBuilders/where/like.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/like.js +8 -3
- package/{src/builders → builders}/requestBuilders/where/notEqWhere.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/notEqWhere.js +8 -3
- package/{src/builders → builders}/requestBuilders/where/or.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/or.js +19 -2
- package/{src/builders → builders}/requestBuilders/where/rawWhere.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/rawWhere.js +2 -1
- package/{src/builders → builders}/requestBuilders/where/static.d.ts +5 -1
- package/{src/builders → builders}/requestBuilders/where/static.js +9 -2
- package/{src/docs/cases/simple_delete.d.ts → builders/requestBuilders/where/static.spec.d.ts} +0 -0
- package/{tests/lowLevelbuilders/updates/updates.test.js → builders/requestBuilders/where/static.spec.js} +27 -18
- package/{src/builders → builders}/requestBuilders/where/var.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/var.js +5 -1
- package/{src/builders → builders}/requestBuilders/where/where.d.ts +8 -1
- package/{src/builders → builders}/requestBuilders/where/where.js +0 -0
- package/{src/builders → builders}/transaction/transaction.d.ts +0 -0
- package/{src/builders → builders}/transaction/transaction.js +0 -0
- package/{src/columns → columns}/column.d.ts +0 -0
- package/{src/columns → columns}/column.js +0 -0
- package/{src/columns → columns}/index.d.ts +0 -0
- package/{src/columns → columns}/index.js +0 -0
- package/{src/columns → columns}/types/columnType.d.ts +0 -0
- package/{src/columns → columns}/types/columnType.js +0 -0
- package/{src/columns → columns}/types/pgBigDecimal.d.ts +0 -0
- package/{src/columns → columns}/types/pgBigDecimal.js +0 -0
- package/{src/columns → columns}/types/pgBigInt.d.ts +0 -0
- package/{src/columns → columns}/types/pgBigInt.js +0 -0
- package/{src/columns → columns}/types/pgBigSerial.d.ts +0 -0
- package/{src/columns → columns}/types/pgBigSerial.js +0 -0
- package/{src/columns → columns}/types/pgBoolean.d.ts +0 -0
- package/{src/columns → columns}/types/pgBoolean.js +0 -0
- package/{src/columns → columns}/types/pgEnum.d.ts +0 -0
- package/{src/columns → columns}/types/pgEnum.js +0 -0
- package/{src/columns → columns}/types/pgInteger.d.ts +0 -0
- package/{src/columns → columns}/types/pgInteger.js +0 -0
- package/{src/columns → columns}/types/pgJsonb.d.ts +0 -0
- package/{src/columns → columns}/types/pgJsonb.js +0 -0
- package/{src/columns → columns}/types/pgSerial.d.ts +0 -0
- package/{src/columns → columns}/types/pgSerial.js +0 -0
- package/{src/columns → columns}/types/pgSmallInt.d.ts +0 -0
- package/{src/columns → columns}/types/pgSmallInt.js +0 -0
- package/{src/columns → columns}/types/pgText.d.ts +0 -0
- package/{src/columns → columns}/types/pgText.js +0 -0
- package/{src/columns → columns}/types/pgTime.d.ts +0 -0
- package/{src/columns → columns}/types/pgTime.js +0 -0
- package/{src/columns → columns}/types/pgTimestamp.d.ts +0 -0
- package/{src/columns → columns}/types/pgTimestamp.js +0 -0
- package/{src/columns → columns}/types/pgTimestamptz.d.ts +0 -0
- package/{src/columns → columns}/types/pgTimestamptz.js +0 -0
- package/{src/columns → columns}/types/pgVarChar.d.ts +0 -0
- package/{src/columns → columns}/types/pgVarChar.js +0 -0
- package/{src/db → db}/db.d.ts +0 -0
- package/{src/db → db}/db.js +0 -0
- package/{src/db → db}/dbConnector.d.ts +0 -0
- package/{src/db → db}/dbConnector.js +0 -0
- package/{src/db → db}/dbStringConnector.d.ts +0 -0
- package/{src/db → db}/dbStringConnector.js +0 -0
- package/{src/db → db}/group_by.d.ts +0 -0
- package/{src/db → db}/group_by.js +0 -0
- package/{src/db → db}/index.d.ts +0 -0
- package/{src/db → db}/index.js +0 -0
- package/{src/db → db}/session.d.ts +0 -0
- package/{src/db → db}/session.js +0 -0
- package/{src/docs/cases/simple_insert.d.ts → docs/cases/simple_delete.d.ts} +0 -0
- package/{src/docs → docs}/cases/simple_delete.js +0 -0
- package/{src/docs/cases/simple_join.d.ts → docs/cases/simple_insert.d.ts} +0 -0
- package/{src/docs → docs}/cases/simple_insert.js +0 -0
- package/{src/docs/cases/simple_select.d.ts → docs/cases/simple_join.d.ts} +0 -0
- package/{src/docs → docs}/cases/simple_join.js +5 -5
- package/{src/docs/cases/simple_update.d.ts → docs/cases/simple_select.d.ts} +0 -0
- package/{src/docs → docs}/cases/simple_select.js +0 -0
- package/{tests/lowLevelbuilders/filters/filters.test.d.ts → docs/cases/simple_update.d.ts} +0 -0
- package/{src/docs → docs}/cases/simple_update.js +0 -0
- package/{src/docs → docs}/tables/citiesTable.d.ts +0 -0
- package/{src/docs → docs}/tables/citiesTable.js +0 -0
- package/{src/docs → docs}/tables/userGroupsTable.d.ts +1 -0
- package/{src/docs → docs}/tables/userGroupsTable.js +1 -0
- package/{src/docs → docs}/tables/usersTable.d.ts +0 -0
- package/{src/docs → docs}/tables/usersTable.js +1 -1
- package/{src/docs → docs}/tables/usersToUserGroups.d.ts +0 -0
- package/{src/docs → docs}/tables/usersToUserGroups.js +0 -0
- package/{src/docs → docs}/types/rolesType.d.ts +0 -0
- package/{src/docs → docs}/types/rolesType.js +0 -0
- package/{src/errors → errors}/baseError.d.ts +0 -0
- package/{src/errors → errors}/baseError.js +0 -0
- package/{src/errors → errors}/builderError.d.ts +0 -0
- package/{src/errors → errors}/builderError.js +0 -0
- package/{src/errors → errors}/dbErrors.d.ts +0 -0
- package/{src/errors → errors}/dbErrors.js +0 -0
- package/{src/index.d.ts → index.d.ts} +0 -0
- package/{src/index.js → index.js} +0 -0
- package/{src/indexes → indexes}/tableIndex.d.ts +0 -0
- package/{src/indexes → indexes}/tableIndex.js +0 -0
- package/{src/logger → logger}/abstractLogger.d.ts +0 -0
- package/{src/logger → logger}/abstractLogger.js +0 -0
- package/{src/logger → logger}/consoleLogger.d.ts +0 -0
- package/{src/logger → logger}/consoleLogger.js +0 -0
- package/{src/mappers → mappers}/index.d.ts +0 -0
- package/{src/mappers → mappers}/index.js +0 -0
- package/{src/mappers → mappers}/responseMapper.d.ts +3 -4
- package/{src/mappers → mappers}/responseMapper.js +2 -1
- package/{src/migrator → migrator}/index.d.ts +0 -0
- package/{src/migrator → migrator}/index.js +0 -0
- package/{src/migrator → migrator}/migrator.d.ts +0 -0
- package/{src/migrator → migrator}/migrator.js +0 -0
- package/package.json +4 -4
- package/{src/serializer → serializer}/serializer.d.ts +0 -0
- package/{src/serializer → serializer}/serializer.js +0 -0
- package/{src/tables → tables}/abstractTable.d.ts +3 -4
- package/{src/tables → tables}/abstractTable.js +1 -0
- package/{src/tables → tables}/index.d.ts +0 -0
- package/{src/tables → tables}/index.js +0 -0
- package/{src/tables → tables}/inferTypes.d.ts +6 -2
- package/{src/tables → tables}/inferTypes.js +0 -0
- package/{src/tables → tables}/migrationsTable.d.ts +0 -0
- package/{src/tables → tables}/migrationsTable.js +0 -0
- package/{src/test.d.ts → test.d.ts} +0 -0
- package/test.js +177 -0
- package/{src/types → types}/type.d.ts +0 -0
- package/{src/types → types}/type.js +0 -0
- package/{src/utils → utils}/ecranate.d.ts +0 -0
- package/{src/utils → utils}/ecranate.js +0 -0
- package/src/builders/highLvlBuilders/selectRequestBuilder.d.ts +0 -47
- package/src/builders/lowLvlBuilders/selects/select.js +0 -16
- package/src/builders/lowLvlBuilders/selects/selectFrom.js +0 -34
- package/src/builders/lowLvlBuilders/selects/selectJoined.js +0 -30
- package/src/test.js +0 -135
- package/tests/columnTypesTests/int/int.test.d.ts +0 -1
- package/tests/columnTypesTests/int/int.test.js +0 -561
- package/tests/columnTypesTests/int/models.d.ts +0 -10
- package/tests/columnTypesTests/int/models.js +0 -69
- package/tests/columnTypesTests/int/to/allIntsTable.d.ts +0 -16
- package/tests/columnTypesTests/int/to/allIntsTable.js +0 -28
- package/tests/examples/selects/index.test.d.ts +0 -1
- package/tests/examples/selects/index.test.js +0 -71
- package/tests/examples/selects/tables/to.d.ts +0 -12
- package/tests/examples/selects/tables/to.js +0 -25
- package/tests/highLevelBuilders/selects/index.test.d.ts +0 -1
- package/tests/highLevelBuilders/selects/index.test.js +0 -61
- package/tests/highLevelBuilders/selects/tables/to.d.ts +0 -12
- package/tests/highLevelBuilders/selects/tables/to.js +0 -25
- package/tests/lowLevelbuilders/filters/filters.test.js +0 -56
- package/tests/lowLevelbuilders/filters/usersTable.d.ts +0 -18
- package/tests/lowLevelbuilders/filters/usersTable.js +0 -32
- package/tests/lowLevelbuilders/updates/updates.test.d.ts +0 -1
- package/tests/lowLevelbuilders/updates/usersTable.d.ts +0 -18
- package/tests/lowLevelbuilders/updates/usersTable.js +0 -32
- package/tests/suites/simpleTableSuite/allInts/usersTable.d.ts +0 -11
- package/tests/suites/simpleTableSuite/allInts/usersTable.js +0 -22
- package/tests/suites/simpleTableSuite/allTexts/usersTable.d.ts +0 -11
- package/tests/suites/simpleTableSuite/allTexts/usersTable.js +0 -22
- package/tests/utils.d.ts +0 -8
- package/tests/utils.js +0 -75
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
21
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
+
exports.SelectJoinedV1 = void 0;
|
|
23
|
+
const whereSelect_1 = __importStar(require("./whereSelect"));
|
|
24
|
+
class SelectJoined {
|
|
25
|
+
constructor(aggregator) {
|
|
26
|
+
this.apply = (joins) => {
|
|
27
|
+
this._aggregator.join(joins);
|
|
28
|
+
return this;
|
|
29
|
+
};
|
|
30
|
+
this.limit = (limit) => {
|
|
31
|
+
this._aggregator.limit(limit);
|
|
32
|
+
return this;
|
|
33
|
+
};
|
|
34
|
+
this.offset = (offset) => {
|
|
35
|
+
this._aggregator.offset(offset);
|
|
36
|
+
return this;
|
|
37
|
+
};
|
|
38
|
+
this.orderBy = (orderBy, order) => {
|
|
39
|
+
this._aggregator.orderBy(orderBy, order);
|
|
40
|
+
return this;
|
|
41
|
+
};
|
|
42
|
+
this.filteredBy = (filters) => new whereSelect_1.default(this._aggregator).apply(filters);
|
|
43
|
+
this.build = () => this._aggregator.buildQuery();
|
|
44
|
+
this._aggregator = aggregator;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
exports.default = SelectJoined;
|
|
48
|
+
class SelectJoinedV1 {
|
|
49
|
+
constructor(aggregator) {
|
|
50
|
+
this.apply = (joins) => {
|
|
51
|
+
this._aggregator.join(joins);
|
|
52
|
+
return this;
|
|
53
|
+
};
|
|
54
|
+
this.limit = (limit) => {
|
|
55
|
+
this._aggregator.limit(limit);
|
|
56
|
+
return this;
|
|
57
|
+
};
|
|
58
|
+
this.offset = (offset) => {
|
|
59
|
+
this._aggregator.offset(offset);
|
|
60
|
+
return this;
|
|
61
|
+
};
|
|
62
|
+
this.orderBy = (orderBy, order) => {
|
|
63
|
+
this._aggregator.orderBy(orderBy, order);
|
|
64
|
+
return this;
|
|
65
|
+
};
|
|
66
|
+
this.filteredBy = (filters) => new whereSelect_1.WhereSelectV1(this._aggregator).apply(filters);
|
|
67
|
+
this.build = () => this._aggregator.buildQuery();
|
|
68
|
+
this._aggregator = aggregator;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
exports.SelectJoinedV1 = SelectJoinedV1;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import SelectAggregatorV1 from '../../aggregators/selectAggregatorV1';
|
|
1
2
|
import { AbstractColumn } from '../../../columns/column';
|
|
2
3
|
import ColumnType from '../../../columns/types/columnType';
|
|
3
4
|
import SelectAggregator from '../../aggregators/selectAggregator';
|
|
@@ -15,3 +16,15 @@ export default class WhereSelect {
|
|
|
15
16
|
values: any[];
|
|
16
17
|
};
|
|
17
18
|
}
|
|
19
|
+
export declare class WhereSelectV1 {
|
|
20
|
+
private _aggregator;
|
|
21
|
+
constructor(aggregator: SelectAggregatorV1);
|
|
22
|
+
limit: (limit?: number | undefined) => WhereSelectV1;
|
|
23
|
+
offset: (offset?: number | undefined) => WhereSelectV1;
|
|
24
|
+
orderBy: (orderBy?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined, order?: Order | undefined) => WhereSelectV1;
|
|
25
|
+
apply: (filters: Expr) => WhereSelectV1;
|
|
26
|
+
build: () => {
|
|
27
|
+
query: string;
|
|
28
|
+
values: any[];
|
|
29
|
+
};
|
|
30
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.WhereSelectV1 = void 0;
|
|
3
4
|
class WhereSelect {
|
|
4
5
|
constructor(aggregator) {
|
|
5
6
|
this.limit = (limit) => {
|
|
@@ -23,3 +24,26 @@ class WhereSelect {
|
|
|
23
24
|
}
|
|
24
25
|
}
|
|
25
26
|
exports.default = WhereSelect;
|
|
27
|
+
class WhereSelectV1 {
|
|
28
|
+
constructor(aggregator) {
|
|
29
|
+
this.limit = (limit) => {
|
|
30
|
+
this._aggregator.limit(limit);
|
|
31
|
+
return this;
|
|
32
|
+
};
|
|
33
|
+
this.offset = (offset) => {
|
|
34
|
+
this._aggregator.offset(offset);
|
|
35
|
+
return this;
|
|
36
|
+
};
|
|
37
|
+
this.orderBy = (orderBy, order) => {
|
|
38
|
+
this._aggregator.orderBy(orderBy, order);
|
|
39
|
+
return this;
|
|
40
|
+
};
|
|
41
|
+
this.apply = (filters) => {
|
|
42
|
+
this._aggregator.filters(filters);
|
|
43
|
+
return this;
|
|
44
|
+
};
|
|
45
|
+
this.build = () => this._aggregator.buildQuery();
|
|
46
|
+
this._aggregator = aggregator;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
exports.WhereSelectV1 = WhereSelectV1;
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -3,7 +3,14 @@ import { ISession } from '../../../db/session';
|
|
|
3
3
|
export default class And extends Expr {
|
|
4
4
|
private expressions;
|
|
5
5
|
constructor(expressions: Expr[]);
|
|
6
|
-
toQuery: ({ position,
|
|
6
|
+
toQuery: ({ position, session, }: {
|
|
7
|
+
position?: number | undefined;
|
|
8
|
+
session: ISession;
|
|
9
|
+
}) => {
|
|
10
|
+
query: string;
|
|
11
|
+
values: Array<any>;
|
|
12
|
+
};
|
|
13
|
+
toQueryV1: ({ position, tableCache, session, }: {
|
|
7
14
|
position?: number | undefined;
|
|
8
15
|
tableCache?: {
|
|
9
16
|
[tableName: string]: string;
|
|
@@ -8,13 +8,30 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class And extends where_1.default {
|
|
9
9
|
constructor(expressions) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
12
|
let nextPosition = position || 1;
|
|
13
13
|
const result = ['('];
|
|
14
14
|
const valuesResult = [];
|
|
15
15
|
for (let i = 0; i < this.expressions.length; i += 1) {
|
|
16
16
|
const expression = this.expressions[i];
|
|
17
|
-
const expressionResult = expression.toQuery({ position: nextPosition,
|
|
17
|
+
const expressionResult = expression.toQuery({ position: nextPosition, session });
|
|
18
|
+
valuesResult.push(...expressionResult.values);
|
|
19
|
+
result.push(expressionResult.query);
|
|
20
|
+
nextPosition += expressionResult.values.length;
|
|
21
|
+
if (i < this.expressions.length - 1) {
|
|
22
|
+
result.push(' and ');
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
result.push(')');
|
|
26
|
+
return { query: result.join(''), values: valuesResult };
|
|
27
|
+
};
|
|
28
|
+
this.toQueryV1 = ({ position, tableCache, session, }) => {
|
|
29
|
+
let nextPosition = position || 1;
|
|
30
|
+
const result = ['('];
|
|
31
|
+
const valuesResult = [];
|
|
32
|
+
for (let i = 0; i < this.expressions.length; i += 1) {
|
|
33
|
+
const expression = this.expressions[i];
|
|
34
|
+
const expressionResult = expression.toQueryV1({ position: nextPosition, tableCache, session });
|
|
18
35
|
valuesResult.push(...expressionResult.values);
|
|
19
36
|
result.push(expressionResult.query);
|
|
20
37
|
nextPosition += expressionResult.values.length;
|
|
@@ -3,11 +3,15 @@ import Expr from './where';
|
|
|
3
3
|
export default class Const extends Expr {
|
|
4
4
|
private value;
|
|
5
5
|
constructor(value: any);
|
|
6
|
-
toQuery: ({ position,
|
|
6
|
+
toQuery: ({ position, session, }: {
|
|
7
|
+
position?: number | undefined;
|
|
8
|
+
session: ISession;
|
|
9
|
+
}) => {
|
|
10
|
+
query: string;
|
|
11
|
+
values: Array<any>;
|
|
12
|
+
};
|
|
13
|
+
toQueryV1: ({ position, session, }: {
|
|
7
14
|
position?: number | undefined;
|
|
8
|
-
tableCache?: {
|
|
9
|
-
[tableName: string]: string;
|
|
10
|
-
} | undefined;
|
|
11
15
|
session: ISession;
|
|
12
16
|
}) => {
|
|
13
17
|
query: string;
|
|
@@ -8,7 +8,17 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class Const extends where_1.default {
|
|
9
9
|
constructor(value) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
|
+
const nextPosition = position || 1;
|
|
13
|
+
if (this.value instanceof Date) {
|
|
14
|
+
return { query: session.parametrized(nextPosition), values: [`${this.value.toISOString()}`] };
|
|
15
|
+
}
|
|
16
|
+
if (ecranate_1.shouldEcranate(this.value)) {
|
|
17
|
+
return { query: session.parametrized(nextPosition), values: [`${this.value.toString()}`] };
|
|
18
|
+
}
|
|
19
|
+
return { query: session.parametrized(nextPosition), values: [this.value] };
|
|
20
|
+
};
|
|
21
|
+
this.toQueryV1 = ({ position, session, }) => {
|
|
12
22
|
const nextPosition = position || 1;
|
|
13
23
|
if (this.value instanceof Date) {
|
|
14
24
|
return { query: session.parametrized(nextPosition), values: [`${this.value.toISOString()}`] };
|
|
@@ -3,11 +3,15 @@ import { ISession } from '../../../db/session';
|
|
|
3
3
|
export default class ConstArray extends Expr {
|
|
4
4
|
private values;
|
|
5
5
|
constructor(values: Array<any>);
|
|
6
|
-
toQuery: ({ position,
|
|
6
|
+
toQuery: ({ position, session, }: {
|
|
7
|
+
position?: number | undefined;
|
|
8
|
+
session: ISession;
|
|
9
|
+
}) => {
|
|
10
|
+
query: string;
|
|
11
|
+
values: Array<any>;
|
|
12
|
+
};
|
|
13
|
+
toQueryV1: ({ position, session, }: {
|
|
7
14
|
position?: number | undefined;
|
|
8
|
-
tableCache?: {
|
|
9
|
-
[tableName: string]: string;
|
|
10
|
-
} | undefined;
|
|
11
15
|
session: ISession;
|
|
12
16
|
}) => {
|
|
13
17
|
query: string;
|
|
@@ -8,7 +8,32 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class ConstArray extends where_1.default {
|
|
9
9
|
constructor(values) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
|
+
let nextPosition = position || 1;
|
|
13
|
+
const finalArray = [];
|
|
14
|
+
const finalValues = [];
|
|
15
|
+
for (let i = 0; i < this.values.length; i += 1) {
|
|
16
|
+
const value = this.values[i];
|
|
17
|
+
if (value instanceof Date) {
|
|
18
|
+
finalArray.push(session.parametrized(nextPosition));
|
|
19
|
+
finalValues.push(`${value.toISOString()}`);
|
|
20
|
+
}
|
|
21
|
+
else if (ecranate_1.shouldEcranate(value)) {
|
|
22
|
+
finalArray.push(session.parametrized(nextPosition));
|
|
23
|
+
finalValues.push(`${value.toString()}`);
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
finalArray.push(session.parametrized(nextPosition));
|
|
27
|
+
finalValues.push(value);
|
|
28
|
+
}
|
|
29
|
+
if (i < this.values.length - 1) {
|
|
30
|
+
finalArray.push(',');
|
|
31
|
+
}
|
|
32
|
+
nextPosition += 1;
|
|
33
|
+
}
|
|
34
|
+
return { query: finalArray.join(''), values: finalValues };
|
|
35
|
+
};
|
|
36
|
+
this.toQueryV1 = ({ position, session, }) => {
|
|
12
37
|
let nextPosition = position || 1;
|
|
13
38
|
const finalArray = [];
|
|
14
39
|
const finalValues = [];
|
|
@@ -4,7 +4,17 @@ export default class EqWhere extends Expr {
|
|
|
4
4
|
private left;
|
|
5
5
|
private right;
|
|
6
6
|
constructor(left: Expr, right: Expr);
|
|
7
|
-
toQuery: ({ position,
|
|
7
|
+
toQuery: ({ position, session, }: {
|
|
8
|
+
position?: number | undefined;
|
|
9
|
+
tableCache?: {
|
|
10
|
+
[tableName: string]: string;
|
|
11
|
+
} | undefined;
|
|
12
|
+
session: ISession;
|
|
13
|
+
}) => {
|
|
14
|
+
query: string;
|
|
15
|
+
values: Array<any>;
|
|
16
|
+
};
|
|
17
|
+
toQueryV1: ({ position, tableCache, session, }: {
|
|
8
18
|
position?: number | undefined;
|
|
9
19
|
tableCache?: {
|
|
10
20
|
[tableName: string]: string;
|
|
@@ -8,9 +8,14 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class EqWhere extends where_1.default {
|
|
9
9
|
constructor(left, right) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
12
|
-
const rightPreparedValues = this.right.toQuery({ position,
|
|
13
|
-
const leftPreparedValues = this.left.toQuery({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
|
+
const rightPreparedValues = this.right.toQuery({ position, session });
|
|
13
|
+
const leftPreparedValues = this.left.toQuery({ position, session });
|
|
14
|
+
return { query: `${leftPreparedValues.query}=${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
|
+
};
|
|
16
|
+
this.toQueryV1 = ({ position, tableCache, session, }) => {
|
|
17
|
+
const rightPreparedValues = this.right.toQueryV1({ position, tableCache, session });
|
|
18
|
+
const leftPreparedValues = this.left.toQueryV1({ position, tableCache, session });
|
|
14
19
|
return { query: `${leftPreparedValues.query}=${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
20
|
};
|
|
16
21
|
this.left = left;
|
|
@@ -7,7 +7,14 @@ export default class Greater extends Expr {
|
|
|
7
7
|
left: Expr;
|
|
8
8
|
right: Expr;
|
|
9
9
|
});
|
|
10
|
-
toQuery: ({ position,
|
|
10
|
+
toQuery: ({ position, session, }: {
|
|
11
|
+
position?: number | undefined;
|
|
12
|
+
session: ISession;
|
|
13
|
+
}) => {
|
|
14
|
+
query: string;
|
|
15
|
+
values: Array<any>;
|
|
16
|
+
};
|
|
17
|
+
toQueryV1: ({ position, tableCache, session, }: {
|
|
11
18
|
position?: number | undefined;
|
|
12
19
|
tableCache?: {
|
|
13
20
|
[tableName: string]: string;
|
|
@@ -8,9 +8,14 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class Greater extends where_1.default {
|
|
9
9
|
constructor({ left, right }) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
12
|
-
const rightPreparedValues = this.right.toQuery({ position,
|
|
13
|
-
const leftPreparedValues = this.left.toQuery({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
|
+
const rightPreparedValues = this.right.toQuery({ position, session });
|
|
13
|
+
const leftPreparedValues = this.left.toQuery({ position, session });
|
|
14
|
+
return { query: `${leftPreparedValues.query} > ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
|
+
};
|
|
16
|
+
this.toQueryV1 = ({ position, tableCache, session, }) => {
|
|
17
|
+
const rightPreparedValues = this.right.toQueryV1({ position, tableCache, session });
|
|
18
|
+
const leftPreparedValues = this.left.toQueryV1({ position, tableCache, session });
|
|
14
19
|
return { query: `${leftPreparedValues.query} > ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
20
|
};
|
|
16
21
|
this.left = left;
|
|
@@ -7,7 +7,14 @@ export default class GreaterEq extends Expr {
|
|
|
7
7
|
left: Expr;
|
|
8
8
|
right: Expr;
|
|
9
9
|
});
|
|
10
|
-
toQuery: ({ position,
|
|
10
|
+
toQuery: ({ position, session, }: {
|
|
11
|
+
position?: number | undefined;
|
|
12
|
+
session: ISession;
|
|
13
|
+
}) => {
|
|
14
|
+
query: string;
|
|
15
|
+
values: Array<any>;
|
|
16
|
+
};
|
|
17
|
+
toQueryV1: ({ position, tableCache, session, }: {
|
|
11
18
|
position?: number | undefined;
|
|
12
19
|
tableCache?: {
|
|
13
20
|
[tableName: string]: string;
|
|
@@ -8,9 +8,14 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class GreaterEq extends where_1.default {
|
|
9
9
|
constructor({ left, right }) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
12
|
-
const rightPreparedValues = this.right.toQuery({ position,
|
|
13
|
-
const leftPreparedValues = this.left.toQuery({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
|
+
const rightPreparedValues = this.right.toQuery({ position, session });
|
|
13
|
+
const leftPreparedValues = this.left.toQuery({ position, session });
|
|
14
|
+
return { query: `${leftPreparedValues.query} >= ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
|
+
};
|
|
16
|
+
this.toQueryV1 = ({ position, tableCache, session, }) => {
|
|
17
|
+
const rightPreparedValues = this.right.toQueryV1({ position, tableCache, session });
|
|
18
|
+
const leftPreparedValues = this.left.toQueryV1({ position, tableCache, session });
|
|
14
19
|
return { query: `${leftPreparedValues.query} >= ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
20
|
};
|
|
16
21
|
this.left = left;
|
|
@@ -4,7 +4,14 @@ export default class In extends Expr {
|
|
|
4
4
|
private left;
|
|
5
5
|
private right;
|
|
6
6
|
constructor(left: Expr, right: Expr);
|
|
7
|
-
toQuery: ({ position,
|
|
7
|
+
toQuery: ({ position, session, }: {
|
|
8
|
+
position?: number | undefined;
|
|
9
|
+
session: ISession;
|
|
10
|
+
}) => {
|
|
11
|
+
query: string;
|
|
12
|
+
values: Array<any>;
|
|
13
|
+
};
|
|
14
|
+
toQueryV1: ({ position, tableCache, session, }: {
|
|
8
15
|
position?: number | undefined;
|
|
9
16
|
tableCache?: {
|
|
10
17
|
[tableName: string]: string;
|
|
@@ -8,9 +8,14 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class In extends where_1.default {
|
|
9
9
|
constructor(left, right) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
12
|
-
const rightPreparedValues = this.right.toQuery({ position,
|
|
13
|
-
const leftPreparedValues = this.left.toQuery({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
|
+
const rightPreparedValues = this.right.toQuery({ position, session });
|
|
13
|
+
const leftPreparedValues = this.left.toQuery({ position, session });
|
|
14
|
+
return { query: `${leftPreparedValues.query} in (${rightPreparedValues.query})`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
|
+
};
|
|
16
|
+
this.toQueryV1 = ({ position, tableCache, session, }) => {
|
|
17
|
+
const rightPreparedValues = this.right.toQueryV1({ position, tableCache, session });
|
|
18
|
+
const leftPreparedValues = this.left.toQueryV1({ position, tableCache, session });
|
|
14
19
|
return { query: `${leftPreparedValues.query} in (${rightPreparedValues.query})`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
20
|
};
|
|
16
21
|
this.left = left;
|
|
@@ -3,7 +3,14 @@ import { ISession } from '../../../db/session';
|
|
|
3
3
|
export default class IsNotNull extends Expr {
|
|
4
4
|
private left;
|
|
5
5
|
constructor(left: Expr);
|
|
6
|
-
toQuery: ({ position,
|
|
6
|
+
toQuery: ({ position, session, }: {
|
|
7
|
+
position?: number | undefined;
|
|
8
|
+
session: ISession;
|
|
9
|
+
}) => {
|
|
10
|
+
query: string;
|
|
11
|
+
values: Array<any>;
|
|
12
|
+
};
|
|
13
|
+
toQueryV1: ({ position, tableCache, session, }: {
|
|
7
14
|
position?: number | undefined;
|
|
8
15
|
tableCache?: {
|
|
9
16
|
[tableName: string]: string;
|
|
@@ -8,8 +8,12 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class IsNotNull extends where_1.default {
|
|
9
9
|
constructor(left) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
12
|
-
const leftPreparedValues = this.left.toQuery({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
|
+
const leftPreparedValues = this.left.toQuery({ position, session });
|
|
13
|
+
return { query: `${leftPreparedValues.query} is not null`, values: leftPreparedValues.values };
|
|
14
|
+
};
|
|
15
|
+
this.toQueryV1 = ({ position, tableCache, session, }) => {
|
|
16
|
+
const leftPreparedValues = this.left.toQueryV1({ position, tableCache, session });
|
|
13
17
|
return { query: `${leftPreparedValues.query} is not null`, values: leftPreparedValues.values };
|
|
14
18
|
};
|
|
15
19
|
this.left = left;
|
|
@@ -3,7 +3,14 @@ import { ISession } from '../../../db/session';
|
|
|
3
3
|
export default class IsNull extends Expr {
|
|
4
4
|
private left;
|
|
5
5
|
constructor(left: Expr);
|
|
6
|
-
toQuery: ({ position,
|
|
6
|
+
toQuery: ({ position, session, }: {
|
|
7
|
+
position?: number | undefined;
|
|
8
|
+
session: ISession;
|
|
9
|
+
}) => {
|
|
10
|
+
query: string;
|
|
11
|
+
values: Array<any>;
|
|
12
|
+
};
|
|
13
|
+
toQueryV1: ({ position, tableCache, session, }: {
|
|
7
14
|
position?: number | undefined;
|
|
8
15
|
tableCache?: {
|
|
9
16
|
[tableName: string]: string;
|
|
@@ -8,8 +8,12 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class IsNull extends where_1.default {
|
|
9
9
|
constructor(left) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
12
|
-
const leftPreparedValues = this.left.toQuery({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
|
+
const leftPreparedValues = this.left.toQuery({ position, session });
|
|
13
|
+
return { query: `${leftPreparedValues.query} is null`, values: leftPreparedValues.values };
|
|
14
|
+
};
|
|
15
|
+
this.toQueryV1 = ({ position, tableCache, session, }) => {
|
|
16
|
+
const leftPreparedValues = this.left.toQueryV1({ position, tableCache, session });
|
|
13
17
|
return { query: `${leftPreparedValues.query} is null`, values: leftPreparedValues.values };
|
|
14
18
|
};
|
|
15
19
|
this.left = left;
|
|
@@ -7,7 +7,14 @@ export default class Less extends Expr {
|
|
|
7
7
|
left: Expr;
|
|
8
8
|
right: Expr;
|
|
9
9
|
});
|
|
10
|
-
toQuery: ({ position,
|
|
10
|
+
toQuery: ({ position, session, }: {
|
|
11
|
+
position?: number | undefined;
|
|
12
|
+
session: ISession;
|
|
13
|
+
}) => {
|
|
14
|
+
query: string;
|
|
15
|
+
values: Array<any>;
|
|
16
|
+
};
|
|
17
|
+
toQueryV1: ({ position, tableCache, session, }: {
|
|
11
18
|
position?: number | undefined;
|
|
12
19
|
tableCache?: {
|
|
13
20
|
[tableName: string]: string;
|
|
@@ -8,9 +8,14 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class Less extends where_1.default {
|
|
9
9
|
constructor({ left, right }) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
12
|
-
const rightPreparedValues = this.right.toQuery({ position,
|
|
13
|
-
const leftPreparedValues = this.left.toQuery({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
|
+
const rightPreparedValues = this.right.toQuery({ position, session });
|
|
13
|
+
const leftPreparedValues = this.left.toQuery({ position, session });
|
|
14
|
+
return { query: `${leftPreparedValues.query} < ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
|
+
};
|
|
16
|
+
this.toQueryV1 = ({ position, tableCache, session, }) => {
|
|
17
|
+
const rightPreparedValues = this.right.toQueryV1({ position, tableCache, session });
|
|
18
|
+
const leftPreparedValues = this.left.toQueryV1({ position, tableCache, session });
|
|
14
19
|
return { query: `${leftPreparedValues.query} < ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
20
|
};
|
|
16
21
|
this.left = left;
|
|
@@ -7,7 +7,14 @@ export default class LessEq extends Expr {
|
|
|
7
7
|
left: Expr;
|
|
8
8
|
right: Expr;
|
|
9
9
|
});
|
|
10
|
-
toQuery: ({ position,
|
|
10
|
+
toQuery: ({ position, session, }: {
|
|
11
|
+
position?: number | undefined;
|
|
12
|
+
session: ISession;
|
|
13
|
+
}) => {
|
|
14
|
+
query: string;
|
|
15
|
+
values: Array<any>;
|
|
16
|
+
};
|
|
17
|
+
toQueryV1: ({ position, tableCache, session, }: {
|
|
11
18
|
position?: number | undefined;
|
|
12
19
|
tableCache?: {
|
|
13
20
|
[tableName: string]: string;
|
|
@@ -8,9 +8,14 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class LessEq extends where_1.default {
|
|
9
9
|
constructor({ left, right }) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
12
|
-
const rightPreparedValues = this.right.toQuery({ position,
|
|
13
|
-
const leftPreparedValues = this.left.toQuery({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
|
+
const rightPreparedValues = this.right.toQuery({ position, session });
|
|
13
|
+
const leftPreparedValues = this.left.toQuery({ position, session });
|
|
14
|
+
return { query: `${leftPreparedValues.query} <= ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
|
+
};
|
|
16
|
+
this.toQueryV1 = ({ position, tableCache, session, }) => {
|
|
17
|
+
const rightPreparedValues = this.right.toQueryV1({ position, tableCache, session });
|
|
18
|
+
const leftPreparedValues = this.left.toQueryV1({ position, tableCache, session });
|
|
14
19
|
return { query: `${leftPreparedValues.query} <= ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
20
|
};
|
|
16
21
|
this.left = left;
|
|
@@ -4,7 +4,14 @@ export default class Like extends Expr {
|
|
|
4
4
|
private left;
|
|
5
5
|
private right;
|
|
6
6
|
constructor(left: Expr, right: Expr);
|
|
7
|
-
toQuery: ({ position,
|
|
7
|
+
toQuery: ({ position, session, }: {
|
|
8
|
+
position?: number | undefined;
|
|
9
|
+
session: ISession;
|
|
10
|
+
}) => {
|
|
11
|
+
query: string;
|
|
12
|
+
values: Array<any>;
|
|
13
|
+
};
|
|
14
|
+
toQueryV1: ({ position, tableCache, session, }: {
|
|
8
15
|
position?: number | undefined;
|
|
9
16
|
tableCache?: {
|
|
10
17
|
[tableName: string]: string;
|
|
@@ -8,9 +8,14 @@ const where_1 = __importDefault(require("./where"));
|
|
|
8
8
|
class Like extends where_1.default {
|
|
9
9
|
constructor(left, right) {
|
|
10
10
|
super();
|
|
11
|
-
this.toQuery = ({ position,
|
|
12
|
-
const rightPreparedValues = this.right.toQuery({ position,
|
|
13
|
-
const leftPreparedValues = this.left.toQuery({ position,
|
|
11
|
+
this.toQuery = ({ position, session, }) => {
|
|
12
|
+
const rightPreparedValues = this.right.toQuery({ position, session });
|
|
13
|
+
const leftPreparedValues = this.left.toQuery({ position, session });
|
|
14
|
+
return { query: `${leftPreparedValues.query} like ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
|
+
};
|
|
16
|
+
this.toQueryV1 = ({ position, tableCache, session, }) => {
|
|
17
|
+
const rightPreparedValues = this.right.toQueryV1({ position, tableCache, session });
|
|
18
|
+
const leftPreparedValues = this.left.toQueryV1({ position, tableCache, session });
|
|
14
19
|
return { query: `${leftPreparedValues.query} like ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
|
|
15
20
|
};
|
|
16
21
|
this.left = left;
|