typeorm 0.3.10 → 0.3.11-dev.5253c8f

package/package.json

@@ -1,274 +1 @@
-{
-  "name": "typeorm",
-  "private": false,
-  "version": "0.3.10",
-  "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"
-  },
-  "engines": {
-    "node": ">= 12.9.0"
-  },
-  "exports": {
-    ".": {
-      "types": "./index.d.ts",
-      "node": {
-        "import": "./index.mjs",
-        "require": "./index.js",
-        "types": "./index.d.ts"
-      },
-      "browser": {
-        "require": "./index.js",
-        "import": "./browser/index.js",
-        "default": "./index.js"
-      }
-    },
-    "./browser": {
-      "types": "./index.d.ts",
-      "default": "./browser/index.js"
-    },
-    "./*.js": "./*.js",
-    "./*": {
-      "require": "./*.js",
-      "import": "./*"
-    }
-  },
-  "main": "./index.js",
-  "module": "./index.mjs",
-  "types": "./index.d.ts",
-  "browser": {
-    "./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/driver/aurora-data-api/AuroraDataApiDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/driver/better-sqlite3/BetterSqlite3Driver.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/driver/cockroachdb/CockroachDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/driver/mongodb/MongoDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/driver/mongodb/MongoQueryRunner.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/driver/mysql/MysqlDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/driver/oracle/OracleDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/driver/postgres/PostgresDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/driver/sap/SapDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/driver/sqlite/SqliteDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/driver/sqlserver/SqlServerDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/entity-manager/MongoEntityManager.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/logger/FileLogger.js": "./browser/platform/BrowserFileLoggerDummy.js",
-    "./browser/platform/PlatformTools.js": "./browser/platform/BrowserPlatformTools.js",
-    "./browser/repository/MongoRepository.js": "./browser/platform/BrowserDisabledDriversDummy.js",
-    "./browser/util/DirectoryExportedClassesLoader.js": "./browser/platform/BrowserDirectoryExportedClassesLoader.js",
-    "./index.js": "./browser/index.js",
-    "./index.mjs": "./browser/index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/typeorm/typeorm.git"
-  },
-  "bugs": {
-    "url": "https://github.com/typeorm/typeorm/issues"
-  },
-  "homepage": "https://typeorm.io",
-  "tags": [
-    "orm",
-    "typescript",
-    "typescript-orm",
-    "mysql",
-    "mysql-orm",
-    "postgresql",
-    "postgresql-orm",
-    "mariadb",
-    "mariadb-orm",
-    "spanner",
-    "sqlite",
-    "sqlite-orm",
-    "sql-server",
-    "sql-server-orm",
-    "oracle",
-    "oracle-orm",
-    "cloud-spanner",
-    "cloud-spanner-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/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/uuid": "^8.3.4",
-    "@types/xml2js": "^0.4.8",
-    "@types/yargs": "^17.0.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",
-    "gulp": "^4.0.2",
-    "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",
-    "mocha": "^8.3.0",
-    "mongodb": "^3.6.4",
-    "mssql": "^7.3.0",
-    "mysql": "^2.18.1",
-    "mysql2": "^2.2.5",
-    "pg": "^8.5.1",
-    "pg-query-stream": "^4.0.0",
-    "prettier": "^2.5.1",
-    "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.11",
-    "ts-node": "^10.7.0",
-    "typeorm-aurora-data-api-driver": "^2.0.0",
-    "typescript": "^4.8.2"
-  },
-  "peerDependencies": {
-    "@google-cloud/spanner": "^5.18.0",
-    "@sap/hana-client": "^2.12.25",
-    "better-sqlite3": "^7.1.2",
-    "hdb-pool": "^0.1.6",
-    "ioredis": "^5.0.4",
-    "mongodb": "^3.6.0",
-    "mssql": "^7.3.0",
-    "mysql2": "^2.2.5",
-    "oracledb": "^5.1.0",
-    "pg": "^8.5.1",
-    "pg-native": "^3.0.0",
-    "pg-query-stream": "^4.0.0",
-    "redis": "^3.1.1 || ^4.0.0",
-    "sql.js": "^1.4.0",
-    "sqlite3": "^5.0.3",
-    "ts-node": "^10.7.0",
-    "typeorm-aurora-data-api-driver": "^2.0.0"
-  },
-  "peerDependenciesMeta": {
-    "@google-cloud/spanner": {
-      "optional": true
-    },
-    "@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
-    },
-    "ts-node": {
-      "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",
-    "date-fns": "^2.28.0",
-    "debug": "^4.3.3",
-    "dotenv": "^16.0.0",
-    "glob": "^7.2.0",
-    "js-yaml": "^4.1.0",
-    "mkdirp": "^1.0.4",
-    "reflect-metadata": "^0.1.13",
-    "sha.js": "^2.4.11",
-    "tslib": "^2.3.1",
-    "uuid": "^8.3.2",
-    "xml2js": "^0.4.23",
-    "yargs": "^17.3.1"
-  },
-  "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": "prettier --check \"./src/**/*.ts\" \"./test/**/*.ts\" \"./sample/**/*.ts\"",
-    "format": "prettier --write \"./src/**/*.ts\" \"./test/**/*.ts\" \"./sample/**/*.ts\"",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 2"
-  },
-  "bin": {
-    "typeorm": "./cli.js",
-    "typeorm-ts-node-commonjs": "./cli-ts-node-commonjs.js",
-    "typeorm-ts-node-esm": "./cli-ts-node-esm.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"
-  }
-}
+{ "name": "typeorm", "private": false, "version": "0.3.11-dev.5253c8f", "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" }, "engines": { "node": ">= 12.9.0" }, "exports": { ".": { "types": "./index.d.ts", "node": { "import": "./index.mjs", "require": "./index.js", "types": "./index.d.ts" }, "browser": { "require": "./index.js", "import": "./browser/index.js", "default": "./index.js" } }, "./browser": { "types": "./index.d.ts", "default": "./browser/index.js" }, "./*.js": "./*.js", "./*": { "require": "./*.js", "import": "./*" } }, "main": "./index.js", "module": "./index.mjs", "types": "./index.d.ts", "browser": { "./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/driver/aurora-data-api/AuroraDataApiDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/better-sqlite3/BetterSqlite3Driver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/cockroachdb/CockroachDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mongodb/MongoDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mongodb/MongoQueryRunner.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mysql/MysqlDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/oracle/OracleDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/postgres/PostgresDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sap/SapDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sqlite/SqliteDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sqlserver/SqlServerDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/entity-manager/MongoEntityManager.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/logger/FileLogger.js": "./browser/platform/BrowserFileLoggerDummy.js", "./browser/platform/PlatformTools.js": "./browser/platform/BrowserPlatformTools.js", "./browser/repository/MongoRepository.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/util/DirectoryExportedClassesLoader.js": "./browser/platform/BrowserDirectoryExportedClassesLoader.js", "./index.js": "./browser/index.js", "./index.mjs": "./browser/index.js" }, "repository": { "type": "git", "url": "https://github.com/typeorm/typeorm.git" }, "bugs": { "url": "https://github.com/typeorm/typeorm/issues" }, "homepage": "https://typeorm.io", "tags": [ "orm", "typescript", "typescript-orm", "mysql", "mysql-orm", "postgresql", "postgresql-orm", "mariadb", "mariadb-orm", "spanner", "sqlite", "sqlite-orm", "sql-server", "sql-server-orm", "oracle", "oracle-orm", "cloud-spanner", "cloud-spanner-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/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/uuid": "^8.3.4", "@types/xml2js": "^0.4.8", "@types/yargs": "^17.0.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", "gulp": "^4.0.2", "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", "mocha": "^8.3.0", "mongodb": "^3.6.4", "mssql": "^7.3.0", "mysql": "^2.18.1", "mysql2": "^2.2.5", "pg": "^8.5.1", "pg-query-stream": "^4.0.0", "prettier": "^2.5.1", "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.11", "ts-node": "^10.7.0", "typeorm-aurora-data-api-driver": "^2.0.0", "typescript": "^4.8.2" }, "peerDependencies": { "@google-cloud/spanner": "^5.18.0", "@sap/hana-client": "^2.12.25", "better-sqlite3": "^7.1.2", "hdb-pool": "^0.1.6", "ioredis": "^5.0.4", "mongodb": "^3.6.0", "mssql": "^7.3.0", "mysql2": "^2.2.5", "oracledb": "^5.1.0", "pg": "^8.5.1", "pg-native": "^3.0.0", "pg-query-stream": "^4.0.0", "redis": "^3.1.1 || ^4.0.0", "sql.js": "^1.4.0", "sqlite3": "^5.0.3", "ts-node": "^10.7.0", "typeorm-aurora-data-api-driver": "^2.0.0" }, "peerDependenciesMeta": { "@google-cloud/spanner": { "optional": true }, "@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 }, "ts-node": { "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", "date-fns": "^2.28.0", "debug": "^4.3.3", "dotenv": "^16.0.0", "glob": "^7.2.0", "js-yaml": "^4.1.0", "mkdirp": "^1.0.4", "reflect-metadata": "^0.1.13", "sha.js": "^2.4.11", "tslib": "^2.3.1", "uuid": "^8.3.2", "xml2js": "^0.4.23", "yargs": "^17.3.1" }, "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": "prettier --check \"./src/**/*.ts\" \"./test/**/*.ts\" \"./sample/**/*.ts\"", "format": "prettier --write \"./src/**/*.ts\" \"./test/**/*.ts\" \"./sample/**/*.ts\"", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 2" }, "bin": { "typeorm": "./cli.js", "typeorm-ts-node-commonjs": "./cli-ts-node-commonjs.js", "typeorm-ts-node-esm": "./cli-ts-node-esm.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" } }

package/query-builder/SelectQueryBuilder.js

@@ -1485,8 +1485,12 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             : [];
         const allColumns = [...columns, ...nonSelectedPrimaryColumns];
         const finalSelects = [];
+        const escapedAliasName = this.escape(aliasName);
         allColumns.forEach((column) => {
-            let selectionPath = this.escape(aliasName) + "." + this.escape(column.databaseName);
+            let selectionPath = escapedAliasName + "." + this.escape(column.databaseName);
+            if (column.isVirtualProperty && column.query) {
+                selectionPath = `(${column.query(escapedAliasName)})`;
+            }
             if (this.connection.driver.spatialTypes.indexOf(column.type) !== -1) {
                 if (DriverUtils_1.DriverUtils.isMySQLFamily(this.connection.driver) ||
                     this.connection.driver.options.type === "aurora-mysql") {
@@ -2263,7 +2267,19 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         : (nulls === null || nulls === void 0 ? void 0 : nulls.toLowerCase()) === "last"
                             ? "NULLS LAST"
                             : undefined;
-                this.addOrderBy(`${alias}.${propertyPath}`, direction, nulls);
+                let aliasPath = `${alias}.${propertyPath}`;
+                if (column.isVirtualProperty && column.query) {
+                    const selection = this.expressionMap.selects.find((s) => s.selection === aliasPath);
+                    if (selection) {
+                        // this is not building correctly now???
+                        aliasPath = DriverUtils_1.DriverUtils.buildAlias(this.connection.driver, alias, column.databaseName);
+                        selection.aliasName = aliasPath;
+                    }
+                    else {
+                        aliasPath = `(${column.query(alias)})`;
+                    }
+                }
+                this.addOrderBy(aliasPath, direction, nulls);
                 // this.orderBys.push({ alias: alias + "." + propertyPath, direction, nulls });
             }
             else if (embed) {
@@ -2317,7 +2333,10 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 if (!embed && !column && !relation)
                     throw new EntityPropertyNotFoundError_1.EntityPropertyNotFoundError(propertyPath, metadata);
                 if (column) {
-                    const aliasPath = `${alias}.${propertyPath}`;
+                    let aliasPath = `${alias}.${propertyPath}`;
+                    if (column.isVirtualProperty && column.query) {
+                        aliasPath = `(${column.query(alias)})`;
+                    }
                     // const parameterName = alias + "_" + propertyPath.split(".").join("_") + "_" + parameterIndex;
                     // todo: we need to handle other operators as well?
                     let parameterValue = where[key];