typeorm 0.2.40-dev.d039319 → 0.2.41-dev.91080be
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/browser/driver/aurora-data-api/AuroraDataApiQueryRunner.js +17 -23
- package/browser/driver/aurora-data-api/AuroraDataApiQueryRunner.js.map +1 -1
- package/browser/driver/cockroachdb/CockroachQueryRunner.js +17 -23
- package/browser/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
- package/browser/driver/mongodb/MongoConnectionOptions.d.ts +4 -0
- package/browser/driver/mongodb/MongoConnectionOptions.js.map +1 -1
- package/browser/driver/mysql/MysqlQueryRunner.js +21 -23
- package/browser/driver/mysql/MysqlQueryRunner.js.map +1 -1
- package/browser/driver/oracle/OracleQueryRunner.js +7 -17
- package/browser/driver/oracle/OracleQueryRunner.js.map +1 -1
- package/browser/driver/postgres/PostgresDriver.d.ts +1 -0
- package/browser/driver/postgres/PostgresDriver.js +16 -7
- package/browser/driver/postgres/PostgresDriver.js.map +1 -1
- package/browser/driver/postgres/PostgresQueryRunner.d.ts +5 -0
- package/browser/driver/postgres/PostgresQueryRunner.js +308 -129
- package/browser/driver/postgres/PostgresQueryRunner.js.map +1 -1
- package/browser/driver/sap/SapQueryRunner.js +19 -26
- package/browser/driver/sap/SapQueryRunner.js.map +1 -1
- package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +8 -14
- package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
- package/browser/driver/sqlserver/SqlServerQueryRunner.js +25 -27
- package/browser/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
- package/browser/driver/types/MetadataTableType.d.ts +5 -0
- package/browser/driver/types/MetadataTableType.js +8 -0
- package/browser/driver/types/MetadataTableType.js.map +1 -0
- package/browser/find-options/FindConditions.d.ts +6 -2
- package/browser/find-options/FindConditions.js.map +1 -1
- package/browser/find-options/FindTreeOptions.d.ts +5 -1
- package/browser/find-options/FindTreeOptions.js.map +1 -1
- package/browser/query-builder/SelectQueryBuilder.d.ts +1 -1
- package/browser/query-builder/SelectQueryBuilder.js +4 -20
- package/browser/query-builder/SelectQueryBuilder.js.map +1 -1
- package/browser/query-runner/BaseQueryRunner.d.ts +22 -0
- package/browser/query-runner/BaseQueryRunner.js +34 -0
- package/browser/query-runner/BaseQueryRunner.js.map +1 -1
- package/browser/repository/FindTreesOptions.d.ts +9 -0
- package/browser/repository/FindTreesOptions.js +3 -0
- package/browser/repository/FindTreesOptions.js.map +1 -0
- package/browser/repository/TreeRepository.d.ts +4 -1
- package/browser/repository/TreeRepository.js +8 -4
- package/browser/repository/TreeRepository.js.map +1 -1
- package/browser/schema-builder/RdbmsSchemaBuilder.js +1 -1
- package/browser/schema-builder/RdbmsSchemaBuilder.js.map +1 -1
- package/driver/aurora-data-api/AuroraDataApiQueryRunner.js +17 -23
- package/driver/aurora-data-api/AuroraDataApiQueryRunner.js.map +1 -1
- package/driver/cockroachdb/CockroachQueryRunner.js +17 -23
- package/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
- package/driver/mongodb/MongoConnectionOptions.d.ts +4 -0
- package/driver/mongodb/MongoConnectionOptions.js.map +1 -1
- package/driver/mysql/MysqlQueryRunner.js +21 -23
- package/driver/mysql/MysqlQueryRunner.js.map +1 -1
- package/driver/oracle/OracleQueryRunner.js +7 -17
- package/driver/oracle/OracleQueryRunner.js.map +1 -1
- package/driver/postgres/PostgresDriver.d.ts +1 -0
- package/driver/postgres/PostgresDriver.js +16 -7
- package/driver/postgres/PostgresDriver.js.map +1 -1
- package/driver/postgres/PostgresQueryRunner.d.ts +5 -0
- package/driver/postgres/PostgresQueryRunner.js +308 -129
- package/driver/postgres/PostgresQueryRunner.js.map +1 -1
- package/driver/sap/SapQueryRunner.js +19 -26
- package/driver/sap/SapQueryRunner.js.map +1 -1
- package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +8 -14
- package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
- package/driver/sqlserver/SqlServerQueryRunner.js +25 -27
- package/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
- package/driver/types/MetadataTableType.d.ts +5 -0
- package/driver/types/MetadataTableType.js +11 -0
- package/driver/types/MetadataTableType.js.map +1 -0
- package/find-options/FindConditions.d.ts +6 -2
- package/find-options/FindConditions.js.map +1 -1
- package/find-options/FindTreeOptions.d.ts +5 -1
- package/find-options/FindTreeOptions.js.map +1 -1
- package/package.json +1 -1
- package/query-builder/SelectQueryBuilder.d.ts +1 -1
- package/query-builder/SelectQueryBuilder.js +4 -20
- package/query-builder/SelectQueryBuilder.js.map +1 -1
- package/query-runner/BaseQueryRunner.d.ts +22 -0
- package/query-runner/BaseQueryRunner.js +34 -0
- package/query-runner/BaseQueryRunner.js.map +1 -1
- package/repository/FindTreesOptions.d.ts +9 -0
- package/repository/FindTreesOptions.js +4 -0
- package/repository/FindTreesOptions.js.map +1 -0
- package/repository/TreeRepository.d.ts +4 -1
- package/repository/TreeRepository.js +7 -3
- package/repository/TreeRepository.js.map +1 -1
- package/schema-builder/RdbmsSchemaBuilder.js +1 -1
- package/schema-builder/RdbmsSchemaBuilder.js.map +1 -1
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MetadataTableType = void 0;
|
|
4
|
+
var MetadataTableType;
|
|
5
|
+
(function (MetadataTableType) {
|
|
6
|
+
MetadataTableType["VIEW"] = "VIEW";
|
|
7
|
+
MetadataTableType["MATERIALIZED_VIEW"] = "MATERIALIZED_VIEW";
|
|
8
|
+
MetadataTableType["GENERATED_COLUMN"] = "GENERATED_COLUMN";
|
|
9
|
+
})(MetadataTableType = exports.MetadataTableType || (exports.MetadataTableType = {}));
|
|
10
|
+
|
|
11
|
+
//# sourceMappingURL=MetadataTableType.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/driver/types/MetadataTableType.ts"],"names":[],"mappings":";;;AAAA,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IACzB,kCAAa,CAAA;IACb,4DAAuC,CAAA;IACvC,0DAAqC,CAAA;AACzC,CAAC,EAJW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAI5B","file":"MetadataTableType.js","sourcesContent":["export enum MetadataTableType {\n VIEW = \"VIEW\",\n MATERIALIZED_VIEW = \"MATERIALIZED_VIEW\",\n GENERATED_COLUMN = \"GENERATED_COLUMN\"\n}\n"],"sourceRoot":"../.."}
|
|
@@ -2,6 +2,10 @@ import { FindOperator } from "./FindOperator";
|
|
|
2
2
|
/**
|
|
3
3
|
* Used for find operations.
|
|
4
4
|
*/
|
|
5
|
-
export declare type
|
|
6
|
-
|
|
5
|
+
export declare type FindCondition<T> = FindConditions<T> | FindOperator<FindConditions<T>>;
|
|
6
|
+
/**
|
|
7
|
+
* Used for find operations.
|
|
8
|
+
*/
|
|
9
|
+
export declare type FindConditions<T> = T | {
|
|
10
|
+
[P in keyof T]?: T[P] extends Promise<infer U> ? FindCondition<U> : FindCondition<T[P]>;
|
|
7
11
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/find-options/FindConditions.ts"],"names":[],"mappings":"","file":"FindConditions.js","sourcesContent":["import {FindOperator} from \"./FindOperator\";\n\n/**\n * Used for find operations.\n */\nexport type FindConditions<T> = {\n [P in keyof T]?:
|
|
1
|
+
{"version":3,"sources":["../../src/find-options/FindConditions.ts"],"names":[],"mappings":"","file":"FindConditions.js","sourcesContent":["import {FindOperator} from \"./FindOperator\";\n\n/**\n * Used for find operations.\n */\nexport type FindCondition<T> = FindConditions<T> | FindOperator<FindConditions<T>>;\n\n/**\n * Used for find operations.\n */\nexport type FindConditions<T> = T | {\n [P in keyof T]?: T[P] extends Promise<infer U>\n ? FindCondition<U>\n : FindCondition<T[P]>;\n};\n"],"sourceRoot":".."}
|
|
@@ -3,7 +3,11 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export interface FindTreeOptions {
|
|
5
5
|
/**
|
|
6
|
-
|
|
6
|
+
* Indicates what relations of entity should be loaded (simplified left join form).
|
|
7
7
|
*/
|
|
8
8
|
relations?: string[];
|
|
9
|
+
/**
|
|
10
|
+
* When loading a tree from a TreeRepository, limits the depth of the descendents loaded
|
|
11
|
+
*/
|
|
12
|
+
depth?: number;
|
|
9
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/find-options/FindTreeOptions.ts"],"names":[],"mappings":"","file":"FindTreeOptions.js","sourcesContent":["/**\n * Defines a special criteria to find specific entities.\n */\nexport interface FindTreeOptions {\n\n
|
|
1
|
+
{"version":3,"sources":["../../src/find-options/FindTreeOptions.ts"],"names":[],"mappings":"","file":"FindTreeOptions.js","sourcesContent":["/**\n * Defines a special criteria to find specific entities.\n */\nexport interface FindTreeOptions {\n\n /**\n * Indicates what relations of entity should be loaded (simplified left join form).\n */\n relations?: string[];\n\n /**\n * When loading a tree from a TreeRepository, limits the depth of the descendents loaded\n */\n depth?: number;\n\n}\n"],"sourceRoot":".."}
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{ "name": "typeorm", "private": false, "version": "0.2.
|
|
1
|
+
{ "name": "typeorm", "private": false, "version": "0.2.41-dev.91080be", "description": "Data-Mapper ORM for TypeScript, ES7, ES6, ES5. Supports MySQL, PostgreSQL, MariaDB, SQLite, MS SQL Server, Oracle, MongoDB databases.", "license": "MIT", "readmeFilename": "README.md", "author": { "name": "Umed Khudoiberdiev", "email": "pleerock.me@gmail.com" }, "main": "./index.js", "browser": { "./browser/driver/aurora-data-api/AuroraDataApiDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/cockroachdb/CockroachDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/postgres/PostgresDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/oracle/OracleDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sap/SapDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mysql/MysqlDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sqlserver/SqlServerDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mongodb/MongoDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mongodb/MongoQueryRunner.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/entity-manager/MongoEntityManager.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/repository/MongoRepository.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sqlite/SqliteDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/better-sqlite3/BetterSqlite3Driver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/util/DirectoryExportedClassesLoader.js": "./browser/platform/BrowserDirectoryExportedClassesLoader.js", "./browser/logger/FileLogger.js": "./browser/platform/BrowserFileLoggerDummy.js", "./browser/connection/ConnectionOptionsReader.js": "./browser/platform/BrowserConnectionOptionsReaderDummy.js", "./browser/connection/options-reader/ConnectionOptionsXmlReader.js": "./browser/platform/BrowserConnectionOptionsReaderDummy.js", "./browser/connection/options-reader/ConnectionOptionsYmlReader.js": "./browser/platform/BrowserConnectionOptionsReaderDummy.js", "./browser/platform/PlatformTools.js": "./browser/platform/BrowserPlatformTools.js", "./index.js": "./browser/index.js" }, "repository": { "type": "git", "url": "https://github.com/typeorm/typeorm.git" }, "bugs": { "url": "https://github.com/typeorm/typeorm/issues" }, "tags": [ "orm", "typescript", "typescript-orm", "mysql", "mysql-orm", "postgresql", "postgresql-orm", "mariadb", "mariadb-orm", "sqlite", "sqlite-orm", "sql-server", "sql-server-orm", "oracle", "oracle-orm" ], "devDependencies": { "@types/app-root-path": "^1.2.4", "@types/chai": "^4.2.15", "@types/chai-as-promised": "^7.1.3", "@types/debug": "^4.1.5", "@types/dotenv": "^8.2.0", "@types/js-yaml": "^4.0.0", "@types/mkdirp": "^1.0.1", "@types/mocha": "^8.2.1", "@types/node": "^14.14.31", "@types/rimraf": "^3.0.0", "@types/sha.js": "^2.4.0", "@types/sinon": "^9.0.10", "@types/source-map-support": "^0.5.3", "@types/xml2js": "^0.4.8", "@types/yargs": "^17.0.2", "@typescript-eslint/eslint-plugin": "^4.15.2", "@typescript-eslint/parser": "^4.15.2", "better-sqlite3": "^7.1.2", "chai": "^4.3.0", "chai-as-promised": "^7.1.1", "class-transformer": "^0.4.0", "conventional-changelog-angular": "^5.0.12", "conventional-changelog-cli": "^2.1.1", "del": "^6.0.0", "eslint": "^7.20.0", "gulp": "^4.0.2", "gulp-eslint": "^6.0.0", "gulp-istanbul": "^1.1.3", "gulp-mocha": "^8.0.0", "gulp-rename": "^2.0.0", "gulp-replace": "^1.0.0", "gulp-shell": "^0.8.0", "gulp-sourcemaps": "^3.0.0", "gulp-typescript": "^6.0.0-alpha.1", "gulpclass": "^0.2.0", "husky": "^5.1.1", "lint-staged": "^10.5.4", "mocha": "^8.3.0", "mongodb": "^3.6.4", "mssql": "^6.3.1", "mysql": "^2.18.1", "mysql2": "^2.2.5", "oracledb": "^5.1.0", "pg": "^8.5.1", "pg-query-stream": "^4.0.0", "redis": "^3.1.1", "remap-istanbul": "^0.13.0", "rimraf": "^3.0.2", "sinon": "^9.2.4", "sinon-chai": "^3.5.0", "source-map-support": "^0.5.19", "sql.js": "^1.4.0", "sqlite3": "^5.0.2", "ts-node": "^9.1.1", "typeorm-aurora-data-api-driver": "^2.0.0", "typescript": "^4.2.2" }, "peerDependencies": { "@sap/hana-client": "*", "better-sqlite3": "*", "hdb-pool": "*", "ioredis": "*", "mongodb": "^3.6.0", "mssql": "*", "mysql2": "*", "oracledb": "*", "pg": "*", "pg-native": "*", "pg-query-stream": "*", "redis": "*", "sql.js": "*", "sqlite3": "*", "typeorm-aurora-data-api-driver": "*" }, "peerDependenciesMeta": { "@sap/hana-client": { "optional": true }, "better-sqlite3": { "optional": true }, "hdb-pool": { "optional": true }, "ioredis": { "optional": true }, "mongodb": { "optional": true }, "mssql": { "optional": true }, "mysql2": { "optional": true }, "oracledb": { "optional": true }, "pg": { "optional": true }, "pg-native": { "optional": true }, "pg-query-stream": { "optional": true }, "redis": { "optional": true }, "sql.js": { "optional": true }, "sqlite3": { "optional": true }, "typeorm-aurora-data-api-driver": { "optional": true } }, "dependencies": { "@sqltools/formatter": "^1.2.2", "app-root-path": "^3.0.0", "buffer": "^6.0.3", "chalk": "^4.1.0", "cli-highlight": "^2.1.11", "debug": "^4.3.1", "dotenv": "^8.2.0", "glob": "^7.1.6", "js-yaml": "^4.0.0", "mkdirp": "^1.0.4", "reflect-metadata": "^0.1.13", "sha.js": "^2.4.11", "tslib": "^2.1.0", "xml2js": "^0.4.23", "yargs": "^17.0.1", "zen-observable-ts": "^1.0.0" }, "lint-staged": { "*.ts": [ "eslint --fix", "git add" ] }, "scripts": { "test": "rimraf ./build && tsc && mocha --file ./build/compiled/test/utils/test-setup.js --bail --recursive --timeout 60000 ./build/compiled/test", "test-fast": "mocha --file ./build/compiled/test/utils/test-setup.js --bail --recursive --timeout 60000 ./build/compiled/test", "compile": "rimraf ./build && tsc", "watch": "./node_modules/.bin/tsc -w", "package": "gulp package", "pack": "gulp pack", "lint": "eslint -c ./.eslintrc.js src/**/*.ts test/**/*.ts sample/**/*.ts", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 2" }, "bin": { "typeorm": "./cli.js" }, "funding": "https://opencollective.com/typeorm", "collective": { "type": "opencollective", "url": "https://opencollective.com/typeorm", "logo": "https://opencollective.com/opencollective/logo.txt" }, "nyc": { "all": true, "cache": false, "exclude": [ "**/*.d.ts" ], "extension": [ ".ts" ], "include": [ "build/compiled/src/**", "src/**" ], "reporter": "json" } }
|
|
@@ -603,7 +603,7 @@ export declare class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> imp
|
|
|
603
603
|
entities: Entity[];
|
|
604
604
|
raw: any[];
|
|
605
605
|
}>;
|
|
606
|
-
protected createOrderByCombinedWithSelectExpression(parentAlias: string): [string, OrderByCondition
|
|
606
|
+
protected createOrderByCombinedWithSelectExpression(parentAlias: string): [string, OrderByCondition];
|
|
607
607
|
/**
|
|
608
608
|
* Loads raw results from the database.
|
|
609
609
|
*/
|
|
@@ -1477,7 +1477,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
|
|
|
1477
1477
|
*/
|
|
1478
1478
|
SelectQueryBuilder.prototype.executeEntitiesAndRawResults = function (queryRunner) {
|
|
1479
1479
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
|
|
1480
|
-
var metadata, relationIdLoader, relationCountLoader, relationIdMetadataTransformer, relationCountMetadataTransformer, rawResults, entities, _a, selects, orderBys_1,
|
|
1480
|
+
var metadata, relationIdLoader, relationCountLoader, relationIdMetadataTransformer, relationCountMetadataTransformer, rawResults, entities, _a, selects, orderBys_1, metadata_1, mainAliasName_1, querySelects, condition, parameters_1, alias_1, ids, areAllNumbers, rawRelationIdResults, rawRelationCountResults, transformer;
|
|
1481
1481
|
var _this = this;
|
|
1482
1482
|
return (0, tslib_1.__generator)(this, function (_b) {
|
|
1483
1483
|
switch (_b.label) {
|
|
@@ -1499,7 +1499,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
|
|
|
1499
1499
|
relationCountMetadataTransformer.transform();
|
|
1500
1500
|
rawResults = [], entities = [];
|
|
1501
1501
|
if (!((this.expressionMap.skip || this.expressionMap.take) && this.expressionMap.joinAttributes.length > 0)) return [3 /*break*/, 4];
|
|
1502
|
-
_a = (0, tslib_1.__read)(this.createOrderByCombinedWithSelectExpression("distinctAlias"),
|
|
1502
|
+
_a = (0, tslib_1.__read)(this.createOrderByCombinedWithSelectExpression("distinctAlias"), 2), selects = _a[0], orderBys_1 = _a[1];
|
|
1503
1503
|
metadata_1 = this.expressionMap.mainAlias.metadata;
|
|
1504
1504
|
mainAliasName_1 = this.expressionMap.mainAlias.name;
|
|
1505
1505
|
querySelects = metadata_1.primaryColumns.map(function (primaryColumn) {
|
|
@@ -1513,7 +1513,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
|
|
|
1513
1513
|
return [4 /*yield*/, new SelectQueryBuilder(this.connection, queryRunner)
|
|
1514
1514
|
.select("DISTINCT " + querySelects.join(", "))
|
|
1515
1515
|
.addSelect(selects)
|
|
1516
|
-
.from("(" + this.clone().orderBy().
|
|
1516
|
+
.from("(" + this.clone().orderBy().getQuery() + ")", "distinctAlias")
|
|
1517
1517
|
.offset(this.expressionMap.skip)
|
|
1518
1518
|
.limit(this.expressionMap.take)
|
|
1519
1519
|
.orderBy(orderBys_1)
|
|
@@ -1623,23 +1623,7 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
|
|
|
1623
1623
|
}
|
|
1624
1624
|
}
|
|
1625
1625
|
});
|
|
1626
|
-
|
|
1627
|
-
.filter(function (orderCriteria) { return orderCriteria.includes("."); })
|
|
1628
|
-
.map(function (orderCriteria) {
|
|
1629
|
-
var criteriaParts = orderCriteria.split(".");
|
|
1630
|
-
var aliasName = criteriaParts[0];
|
|
1631
|
-
var propertyPath = criteriaParts.slice(1).join(".");
|
|
1632
|
-
var alias = _this.expressionMap.findAliasByName(aliasName);
|
|
1633
|
-
if (alias.type !== "join") {
|
|
1634
|
-
return "";
|
|
1635
|
-
}
|
|
1636
|
-
var column = alias.metadata.findColumnWithPropertyPath(propertyPath);
|
|
1637
|
-
var property = _this.escape(alias.name) + "." + _this.escape(column.databaseName);
|
|
1638
|
-
var propertyAlias = _this.escape(DriverUtils_1.DriverUtils.buildAlias(_this.connection.driver, aliasName, column.databaseName));
|
|
1639
|
-
return [property, "AS", propertyAlias].join(" ");
|
|
1640
|
-
})
|
|
1641
|
-
.join(", ");
|
|
1642
|
-
return [selectString, orderByObject, subquerySelectString];
|
|
1626
|
+
return [selectString, orderByObject];
|
|
1643
1627
|
};
|
|
1644
1628
|
/**
|
|
1645
1629
|
* Loads raw results from the database.
|