typeorm 0.2.45-dev.f3cfdd2 → 0.2.45
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/cache/DbQueryResultCache.js +6 -6
- package/browser/cache/DbQueryResultCache.js.map +1 -1
- package/browser/cache/RedisQueryResultCache.js +2 -2
- package/browser/cache/RedisQueryResultCache.js.map +1 -1
- package/browser/connection/Connection.js +2 -2
- package/browser/connection/Connection.js.map +1 -1
- package/browser/connection/ConnectionOptionsReader.js +2 -2
- package/browser/connection/ConnectionOptionsReader.js.map +1 -1
- package/browser/driver/aurora-data-api/AuroraDataApiDriver.js +10 -10
- package/browser/driver/aurora-data-api/AuroraDataApiDriver.js.map +1 -1
- package/browser/driver/aurora-data-api/AuroraDataApiQueryRunner.js +157 -157
- package/browser/driver/aurora-data-api/AuroraDataApiQueryRunner.js.map +1 -1
- package/browser/driver/aurora-data-api-pg/AuroraDataApiPostgresQueryRunner.js +3 -3
- package/browser/driver/aurora-data-api-pg/AuroraDataApiPostgresQueryRunner.js.map +1 -1
- package/browser/driver/better-sqlite3/BetterSqlite3Driver.js +4 -4
- package/browser/driver/better-sqlite3/BetterSqlite3Driver.js.map +1 -1
- package/browser/driver/better-sqlite3/BetterSqlite3QueryRunner.js +2 -2
- package/browser/driver/better-sqlite3/BetterSqlite3QueryRunner.js.map +1 -1
- package/browser/driver/capacitor/CapacitorDriver.js +1 -1
- package/browser/driver/capacitor/CapacitorDriver.js.map +1 -1
- package/browser/driver/capacitor/CapacitorQueryRunner.js +1 -1
- package/browser/driver/capacitor/CapacitorQueryRunner.js.map +1 -1
- package/browser/driver/cockroachdb/CockroachDriver.js +6 -6
- package/browser/driver/cockroachdb/CockroachDriver.js.map +1 -1
- package/browser/driver/cockroachdb/CockroachQueryRunner.js +153 -153
- package/browser/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
- package/browser/driver/cordova/CordovaQueryRunner.js +1 -1
- package/browser/driver/cordova/CordovaQueryRunner.js.map +1 -1
- package/browser/driver/expo/ExpoQueryRunner.js +3 -3
- package/browser/driver/expo/ExpoQueryRunner.js.map +1 -1
- package/browser/driver/mongodb/MongoDriver.js +4 -4
- package/browser/driver/mongodb/MongoDriver.js.map +1 -1
- package/browser/driver/mysql/MysqlDriver.js +11 -11
- package/browser/driver/mysql/MysqlDriver.js.map +1 -1
- package/browser/driver/mysql/MysqlQueryRunner.js +163 -163
- package/browser/driver/mysql/MysqlQueryRunner.js.map +1 -1
- package/browser/driver/nativescript/NativescriptQueryRunner.js +1 -1
- package/browser/driver/nativescript/NativescriptQueryRunner.js.map +1 -1
- package/browser/driver/oracle/OracleDriver.js +10 -10
- package/browser/driver/oracle/OracleDriver.js.map +1 -1
- package/browser/driver/oracle/OracleQueryRunner.js +124 -124
- package/browser/driver/oracle/OracleQueryRunner.js.map +1 -1
- package/browser/driver/postgres/PostgresDriver.js +18 -18
- package/browser/driver/postgres/PostgresDriver.js.map +1 -1
- package/browser/driver/postgres/PostgresQueryRunner.js +229 -229
- package/browser/driver/postgres/PostgresQueryRunner.js.map +1 -1
- package/browser/driver/react-native/ReactNativeQueryRunner.js +1 -1
- package/browser/driver/react-native/ReactNativeQueryRunner.js.map +1 -1
- package/browser/driver/sap/SapDriver.js +9 -9
- package/browser/driver/sap/SapDriver.js.map +1 -1
- package/browser/driver/sap/SapQueryRunner.js +126 -126
- package/browser/driver/sap/SapQueryRunner.js.map +1 -1
- package/browser/driver/sqlite/SqliteDriver.js +4 -4
- package/browser/driver/sqlite/SqliteDriver.js.map +1 -1
- package/browser/driver/sqlite-abstract/AbstractSqliteDriver.js +3 -3
- package/browser/driver/sqlite-abstract/AbstractSqliteDriver.js.map +1 -1
- package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +61 -61
- package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
- package/browser/driver/sqljs/SqljsDriver.js +3 -3
- package/browser/driver/sqljs/SqljsDriver.js.map +1 -1
- package/browser/driver/sqlserver/SqlServerDriver.js +11 -11
- package/browser/driver/sqlserver/SqlServerDriver.js.map +1 -1
- package/browser/driver/sqlserver/SqlServerQueryRunner.js +203 -203
- package/browser/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
- package/browser/entity-manager/EntityManager.js +4 -4
- package/browser/entity-manager/EntityManager.js.map +1 -1
- package/browser/entity-manager/MongoEntityManager.js +1 -1
- package/browser/entity-manager/MongoEntityManager.js.map +1 -1
- package/browser/entity-schema/EntitySchemaEmbeddedError.js +2 -2
- package/browser/entity-schema/EntitySchemaEmbeddedError.js.map +1 -1
- package/browser/error/AlreadyHasActiveConnectionError.js +1 -1
- package/browser/error/AlreadyHasActiveConnectionError.js.map +1 -1
- package/browser/error/CannotAttachTreeChildrenEntityError.js +1 -1
- package/browser/error/CannotAttachTreeChildrenEntityError.js.map +1 -1
- package/browser/error/CannotConnectAlreadyConnectedError.js +1 -1
- package/browser/error/CannotConnectAlreadyConnectedError.js.map +1 -1
- package/browser/error/CannotCreateEntityIdMapError.js +1 -1
- package/browser/error/CannotCreateEntityIdMapError.js.map +1 -1
- package/browser/error/CannotDetermineEntityError.js +1 -1
- package/browser/error/CannotDetermineEntityError.js.map +1 -1
- package/browser/error/CannotExecuteNotConnectedError.js +1 -1
- package/browser/error/CannotExecuteNotConnectedError.js.map +1 -1
- package/browser/error/CannotGetEntityManagerNotConnectedError.js +1 -1
- package/browser/error/CannotGetEntityManagerNotConnectedError.js.map +1 -1
- package/browser/error/CannotReflectMethodParameterTypeError.js +1 -1
- package/browser/error/CannotReflectMethodParameterTypeError.js.map +1 -1
- package/browser/error/CircularRelationsError.js +1 -1
- package/browser/error/CircularRelationsError.js.map +1 -1
- package/browser/error/ColumnTypeUndefinedError.js +1 -1
- package/browser/error/ColumnTypeUndefinedError.js.map +1 -1
- package/browser/error/ConnectionIsNotSetError.js +1 -1
- package/browser/error/ConnectionIsNotSetError.js.map +1 -1
- package/browser/error/ConnectionNotFoundError.js +1 -1
- package/browser/error/ConnectionNotFoundError.js.map +1 -1
- package/browser/error/CustomRepositoryCannotInheritRepositoryError.js +1 -1
- package/browser/error/CustomRepositoryCannotInheritRepositoryError.js.map +1 -1
- package/browser/error/CustomRepositoryDoesNotHaveEntityError.js +1 -1
- package/browser/error/CustomRepositoryDoesNotHaveEntityError.js.map +1 -1
- package/browser/error/CustomRepositoryNotFoundError.js +1 -1
- package/browser/error/CustomRepositoryNotFoundError.js.map +1 -1
- package/browser/error/DataTypeNotSupportedError.js +1 -1
- package/browser/error/DataTypeNotSupportedError.js.map +1 -1
- package/browser/error/DriverOptionNotSetError.js +1 -1
- package/browser/error/DriverOptionNotSetError.js.map +1 -1
- package/browser/error/DriverPackageNotInstalledError.js +2 -2
- package/browser/error/DriverPackageNotInstalledError.js.map +1 -1
- package/browser/error/EntityColumnNotFound.js +1 -1
- package/browser/error/EntityColumnNotFound.js.map +1 -1
- package/browser/error/EntityMetadataNotFoundError.js +1 -1
- package/browser/error/EntityMetadataNotFoundError.js.map +1 -1
- package/browser/error/EntityNotFoundError.js +2 -2
- package/browser/error/EntityNotFoundError.js.map +1 -1
- package/browser/error/FindRelationsNotFoundError.js +2 -2
- package/browser/error/FindRelationsNotFoundError.js.map +1 -1
- package/browser/error/InitializedRelationError.js +1 -1
- package/browser/error/InitializedRelationError.js.map +1 -1
- package/browser/error/MissingDeleteDateColumnError.js +1 -1
- package/browser/error/MissingDeleteDateColumnError.js.map +1 -1
- package/browser/error/MissingDriverError.js +2 -2
- package/browser/error/MissingDriverError.js.map +1 -1
- package/browser/error/MissingJoinColumnError.js +3 -3
- package/browser/error/MissingJoinColumnError.js.map +1 -1
- package/browser/error/MissingJoinTableError.js +3 -3
- package/browser/error/MissingJoinTableError.js.map +1 -1
- package/browser/error/MissingPrimaryColumnError.js +1 -1
- package/browser/error/MissingPrimaryColumnError.js.map +1 -1
- package/browser/error/MustBeEntityError.js +1 -1
- package/browser/error/MustBeEntityError.js.map +1 -1
- package/browser/error/NamingStrategyNotFoundError.js +2 -2
- package/browser/error/NamingStrategyNotFoundError.js.map +1 -1
- package/browser/error/NoConnectionForRepositoryError.js +1 -1
- package/browser/error/NoConnectionForRepositoryError.js.map +1 -1
- package/browser/error/NoConnectionOptionError.js +2 -2
- package/browser/error/NoConnectionOptionError.js.map +1 -1
- package/browser/error/NoVersionOrUpdateDateColumnError.js +1 -1
- package/browser/error/NoVersionOrUpdateDateColumnError.js.map +1 -1
- package/browser/error/OptimisticLockVersionMismatchError.js +1 -1
- package/browser/error/OptimisticLockVersionMismatchError.js.map +1 -1
- package/browser/error/PrimaryColumnCannotBeNullableError.js +1 -1
- package/browser/error/PrimaryColumnCannotBeNullableError.js.map +1 -1
- package/browser/error/RepositoryNotFoundError.js +2 -2
- package/browser/error/RepositoryNotFoundError.js.map +1 -1
- package/browser/error/RepositoryNotTreeError.js +1 -1
- package/browser/error/RepositoryNotTreeError.js.map +1 -1
- package/browser/error/SubjectRemovedAndUpdatedError.js +1 -1
- package/browser/error/SubjectRemovedAndUpdatedError.js.map +1 -1
- package/browser/error/SubjectWithoutIdentifierError.js +1 -1
- package/browser/error/SubjectWithoutIdentifierError.js.map +1 -1
- package/browser/error/TreeRepositoryNotSupportedError.js +1 -1
- package/browser/error/TreeRepositoryNotSupportedError.js.map +1 -1
- package/browser/error/UsingJoinColumnIsNotAllowedError.js +1 -1
- package/browser/error/UsingJoinColumnIsNotAllowedError.js.map +1 -1
- package/browser/error/UsingJoinColumnOnlyOnOneSideAllowedError.js +1 -1
- package/browser/error/UsingJoinColumnOnlyOnOneSideAllowedError.js.map +1 -1
- package/browser/error/UsingJoinTableIsNotAllowedError.js +2 -2
- package/browser/error/UsingJoinTableIsNotAllowedError.js.map +1 -1
- package/browser/error/UsingJoinTableOnlyOnOneSideAllowedError.js +1 -1
- package/browser/error/UsingJoinTableOnlyOnOneSideAllowedError.js.map +1 -1
- package/browser/find-options/FindOptionsUtils.js +6 -6
- package/browser/find-options/FindOptionsUtils.js.map +1 -1
- package/browser/logger/FileLogger.js +3 -3
- package/browser/logger/FileLogger.js.map +1 -1
- package/browser/metadata/EmbeddedMetadata.js +1 -1
- package/browser/metadata/EmbeddedMetadata.js.map +1 -1
- package/browser/metadata/IndexMetadata.js +1 -1
- package/browser/metadata/IndexMetadata.js.map +1 -1
- package/browser/metadata/RelationCountMetadata.js +1 -1
- package/browser/metadata/RelationCountMetadata.js.map +1 -1
- package/browser/metadata/RelationIdMetadata.js +1 -1
- package/browser/metadata/RelationIdMetadata.js.map +1 -1
- package/browser/metadata/UniqueMetadata.js +1 -1
- package/browser/metadata/UniqueMetadata.js.map +1 -1
- package/browser/metadata-builder/EntityMetadataBuilder.js +1 -1
- package/browser/metadata-builder/EntityMetadataBuilder.js.map +1 -1
- package/browser/metadata-builder/EntityMetadataValidator.js +9 -9
- package/browser/metadata-builder/EntityMetadataValidator.js.map +1 -1
- package/browser/metadata-builder/JunctionEntityMetadataBuilder.js +2 -2
- package/browser/metadata-builder/JunctionEntityMetadataBuilder.js.map +1 -1
- package/browser/metadata-builder/RelationJoinColumnBuilder.js +1 -1
- package/browser/metadata-builder/RelationJoinColumnBuilder.js.map +1 -1
- package/browser/migration/MigrationExecutor.js +16 -16
- package/browser/migration/MigrationExecutor.js.map +1 -1
- package/browser/naming-strategy/DefaultNamingStrategy.js +11 -11
- package/browser/naming-strategy/DefaultNamingStrategy.js.map +1 -1
- package/browser/persistence/tree/ClosureSubjectExecutor.js +17 -17
- package/browser/persistence/tree/ClosureSubjectExecutor.js.map +1 -1
- package/browser/persistence/tree/MaterializedPathSubjectExecutor.js +2 -2
- package/browser/persistence/tree/MaterializedPathSubjectExecutor.js.map +1 -1
- package/browser/persistence/tree/NestedSetSubjectExecutor.js +44 -44
- package/browser/persistence/tree/NestedSetSubjectExecutor.js.map +1 -1
- package/browser/platform/BrowserPlatformTools.js +9 -9
- package/browser/platform/BrowserPlatformTools.js.map +1 -1
- package/browser/platform/PlatformTools.js +1 -1
- package/browser/platform/PlatformTools.js.map +1 -1
- package/browser/query-builder/Alias.js +1 -1
- package/browser/query-builder/Alias.js.map +1 -1
- package/browser/query-builder/DeleteQueryBuilder.js +3 -3
- package/browser/query-builder/DeleteQueryBuilder.js.map +1 -1
- package/browser/query-builder/InsertQueryBuilder.js +22 -22
- package/browser/query-builder/InsertQueryBuilder.js.map +1 -1
- package/browser/query-builder/JoinAttribute.js +1 -1
- package/browser/query-builder/JoinAttribute.js.map +1 -1
- package/browser/query-builder/QueryBuilder.js +39 -39
- package/browser/query-builder/QueryBuilder.js.map +1 -1
- package/browser/query-builder/QueryExpressionMap.js +2 -2
- package/browser/query-builder/QueryExpressionMap.js.map +1 -1
- package/browser/query-builder/RelationLoader.js +7 -7
- package/browser/query-builder/RelationLoader.js.map +1 -1
- package/browser/query-builder/RelationQueryBuilder.js +3 -3
- package/browser/query-builder/RelationQueryBuilder.js.map +1 -1
- package/browser/query-builder/RelationRemover.js +4 -4
- package/browser/query-builder/RelationRemover.js.map +1 -1
- package/browser/query-builder/RelationUpdater.js +1 -1
- package/browser/query-builder/RelationUpdater.js.map +1 -1
- package/browser/query-builder/SelectQueryBuilder.js +23 -23
- package/browser/query-builder/SelectQueryBuilder.js.map +1 -1
- package/browser/query-builder/SoftDeleteQueryBuilder.js +4 -4
- package/browser/query-builder/SoftDeleteQueryBuilder.js.map +1 -1
- package/browser/query-builder/UpdateQueryBuilder.js +8 -8
- package/browser/query-builder/UpdateQueryBuilder.js.map +1 -1
- package/browser/query-builder/relation-count/RelationCountAttribute.js +1 -1
- package/browser/query-builder/relation-count/RelationCountAttribute.js.map +1 -1
- package/browser/query-builder/relation-id/RelationIdAttribute.js +1 -1
- package/browser/query-builder/relation-id/RelationIdAttribute.js.map +1 -1
- package/browser/query-builder/relation-id/RelationIdLoader.js +4 -4
- package/browser/query-builder/relation-id/RelationIdLoader.js.map +1 -1
- package/browser/query-runner/BaseQueryRunner.js +7 -7
- package/browser/query-runner/BaseQueryRunner.js.map +1 -1
- package/browser/repository/TreeRepository.js +7 -7
- package/browser/repository/TreeRepository.js.map +1 -1
- package/browser/schema-builder/RdbmsSchemaBuilder.js +19 -19
- package/browser/schema-builder/RdbmsSchemaBuilder.js.map +1 -1
- package/browser/subscriber/Broadcaster.js +1 -1
- package/browser/subscriber/Broadcaster.js.map +1 -1
- package/browser/util/DateUtils.js +1 -1
- package/browser/util/DateUtils.js.map +1 -1
- package/browser/util/DepGraph.js +7 -7
- package/browser/util/DepGraph.js.map +1 -1
- package/browser/util/DirectoryExportedClassesLoader.js +2 -2
- package/browser/util/DirectoryExportedClassesLoader.js.map +1 -1
- package/browser/util/PathUtils.js +1 -1
- package/browser/util/PathUtils.js.map +1 -1
- package/cache/DbQueryResultCache.js +6 -6
- package/cache/DbQueryResultCache.js.map +1 -1
- package/cache/RedisQueryResultCache.js +2 -2
- package/cache/RedisQueryResultCache.js.map +1 -1
- package/cli.js +0 -0
- package/commands/CommandUtils.js +1 -1
- package/commands/CommandUtils.js.map +1 -1
- package/commands/EntityCreateCommand.js +3 -3
- package/commands/EntityCreateCommand.js.map +1 -1
- package/commands/InitCommand.js +6 -6
- package/commands/InitCommand.js.map +1 -1
- package/commands/MigrationCreateCommand.js +3 -3
- package/commands/MigrationCreateCommand.js.map +1 -1
- package/commands/MigrationGenerateCommand.js +8 -8
- package/commands/MigrationGenerateCommand.js.map +1 -1
- package/commands/SchemaLogCommand.js +1 -1
- package/commands/SchemaLogCommand.js.map +1 -1
- package/commands/SubscriberCreateCommand.js +2 -2
- package/commands/SubscriberCreateCommand.js.map +1 -1
- package/connection/Connection.js +2 -2
- package/connection/Connection.js.map +1 -1
- package/connection/ConnectionOptionsReader.js +2 -2
- package/connection/ConnectionOptionsReader.js.map +1 -1
- package/driver/aurora-data-api/AuroraDataApiDriver.js +10 -10
- package/driver/aurora-data-api/AuroraDataApiDriver.js.map +1 -1
- package/driver/aurora-data-api/AuroraDataApiQueryRunner.js +157 -157
- package/driver/aurora-data-api/AuroraDataApiQueryRunner.js.map +1 -1
- package/driver/aurora-data-api-pg/AuroraDataApiPostgresQueryRunner.js +3 -3
- package/driver/aurora-data-api-pg/AuroraDataApiPostgresQueryRunner.js.map +1 -1
- package/driver/better-sqlite3/BetterSqlite3Driver.js +4 -4
- package/driver/better-sqlite3/BetterSqlite3Driver.js.map +1 -1
- package/driver/better-sqlite3/BetterSqlite3QueryRunner.js +2 -2
- package/driver/better-sqlite3/BetterSqlite3QueryRunner.js.map +1 -1
- package/driver/capacitor/CapacitorDriver.js +1 -1
- package/driver/capacitor/CapacitorDriver.js.map +1 -1
- package/driver/capacitor/CapacitorQueryRunner.js +1 -1
- package/driver/capacitor/CapacitorQueryRunner.js.map +1 -1
- package/driver/cockroachdb/CockroachDriver.js +6 -6
- package/driver/cockroachdb/CockroachDriver.js.map +1 -1
- package/driver/cockroachdb/CockroachQueryRunner.js +153 -153
- package/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
- package/driver/cordova/CordovaQueryRunner.js +1 -1
- package/driver/cordova/CordovaQueryRunner.js.map +1 -1
- package/driver/expo/ExpoQueryRunner.js +3 -3
- package/driver/expo/ExpoQueryRunner.js.map +1 -1
- package/driver/mongodb/MongoDriver.js +4 -4
- package/driver/mongodb/MongoDriver.js.map +1 -1
- package/driver/mysql/MysqlDriver.js +11 -11
- package/driver/mysql/MysqlDriver.js.map +1 -1
- package/driver/mysql/MysqlQueryRunner.js +163 -163
- package/driver/mysql/MysqlQueryRunner.js.map +1 -1
- package/driver/nativescript/NativescriptQueryRunner.js +1 -1
- package/driver/nativescript/NativescriptQueryRunner.js.map +1 -1
- package/driver/oracle/OracleDriver.js +10 -10
- package/driver/oracle/OracleDriver.js.map +1 -1
- package/driver/oracle/OracleQueryRunner.js +124 -124
- package/driver/oracle/OracleQueryRunner.js.map +1 -1
- package/driver/postgres/PostgresDriver.js +18 -18
- package/driver/postgres/PostgresDriver.js.map +1 -1
- package/driver/postgres/PostgresQueryRunner.js +229 -229
- package/driver/postgres/PostgresQueryRunner.js.map +1 -1
- package/driver/react-native/ReactNativeQueryRunner.js +1 -1
- package/driver/react-native/ReactNativeQueryRunner.js.map +1 -1
- package/driver/sap/SapDriver.js +9 -9
- package/driver/sap/SapDriver.js.map +1 -1
- package/driver/sap/SapQueryRunner.js +126 -126
- package/driver/sap/SapQueryRunner.js.map +1 -1
- package/driver/sqlite/SqliteDriver.js +4 -4
- package/driver/sqlite/SqliteDriver.js.map +1 -1
- package/driver/sqlite-abstract/AbstractSqliteDriver.js +3 -3
- package/driver/sqlite-abstract/AbstractSqliteDriver.js.map +1 -1
- package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +61 -61
- package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
- package/driver/sqljs/SqljsDriver.js +3 -3
- package/driver/sqljs/SqljsDriver.js.map +1 -1
- package/driver/sqlserver/SqlServerDriver.js +11 -11
- package/driver/sqlserver/SqlServerDriver.js.map +1 -1
- package/driver/sqlserver/SqlServerQueryRunner.js +203 -203
- package/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
- package/entity-manager/EntityManager.js +4 -4
- package/entity-manager/EntityManager.js.map +1 -1
- package/entity-manager/MongoEntityManager.js +1 -1
- package/entity-manager/MongoEntityManager.js.map +1 -1
- package/entity-schema/EntitySchemaEmbeddedError.js +2 -2
- package/entity-schema/EntitySchemaEmbeddedError.js.map +1 -1
- package/error/AlreadyHasActiveConnectionError.js +1 -1
- package/error/AlreadyHasActiveConnectionError.js.map +1 -1
- package/error/CannotAttachTreeChildrenEntityError.js +1 -1
- package/error/CannotAttachTreeChildrenEntityError.js.map +1 -1
- package/error/CannotConnectAlreadyConnectedError.js +1 -1
- package/error/CannotConnectAlreadyConnectedError.js.map +1 -1
- package/error/CannotCreateEntityIdMapError.js +1 -1
- package/error/CannotCreateEntityIdMapError.js.map +1 -1
- package/error/CannotDetermineEntityError.js +1 -1
- package/error/CannotDetermineEntityError.js.map +1 -1
- package/error/CannotExecuteNotConnectedError.js +1 -1
- package/error/CannotExecuteNotConnectedError.js.map +1 -1
- package/error/CannotGetEntityManagerNotConnectedError.js +1 -1
- package/error/CannotGetEntityManagerNotConnectedError.js.map +1 -1
- package/error/CannotReflectMethodParameterTypeError.js +1 -1
- package/error/CannotReflectMethodParameterTypeError.js.map +1 -1
- package/error/CircularRelationsError.js +1 -1
- package/error/CircularRelationsError.js.map +1 -1
- package/error/ColumnTypeUndefinedError.js +1 -1
- package/error/ColumnTypeUndefinedError.js.map +1 -1
- package/error/ConnectionIsNotSetError.js +1 -1
- package/error/ConnectionIsNotSetError.js.map +1 -1
- package/error/ConnectionNotFoundError.js +1 -1
- package/error/ConnectionNotFoundError.js.map +1 -1
- package/error/CustomRepositoryCannotInheritRepositoryError.js +1 -1
- package/error/CustomRepositoryCannotInheritRepositoryError.js.map +1 -1
- package/error/CustomRepositoryDoesNotHaveEntityError.js +1 -1
- package/error/CustomRepositoryDoesNotHaveEntityError.js.map +1 -1
- package/error/CustomRepositoryNotFoundError.js +1 -1
- package/error/CustomRepositoryNotFoundError.js.map +1 -1
- package/error/DataTypeNotSupportedError.js +1 -1
- package/error/DataTypeNotSupportedError.js.map +1 -1
- package/error/DriverOptionNotSetError.js +1 -1
- package/error/DriverOptionNotSetError.js.map +1 -1
- package/error/DriverPackageNotInstalledError.js +2 -2
- package/error/DriverPackageNotInstalledError.js.map +1 -1
- package/error/EntityColumnNotFound.js +1 -1
- package/error/EntityColumnNotFound.js.map +1 -1
- package/error/EntityMetadataNotFoundError.js +1 -1
- package/error/EntityMetadataNotFoundError.js.map +1 -1
- package/error/EntityNotFoundError.js +2 -2
- package/error/EntityNotFoundError.js.map +1 -1
- package/error/FindRelationsNotFoundError.js +2 -2
- package/error/FindRelationsNotFoundError.js.map +1 -1
- package/error/InitializedRelationError.js +1 -1
- package/error/InitializedRelationError.js.map +1 -1
- package/error/MissingDeleteDateColumnError.js +1 -1
- package/error/MissingDeleteDateColumnError.js.map +1 -1
- package/error/MissingDriverError.js +2 -2
- package/error/MissingDriverError.js.map +1 -1
- package/error/MissingJoinColumnError.js +3 -3
- package/error/MissingJoinColumnError.js.map +1 -1
- package/error/MissingJoinTableError.js +3 -3
- package/error/MissingJoinTableError.js.map +1 -1
- package/error/MissingPrimaryColumnError.js +1 -1
- package/error/MissingPrimaryColumnError.js.map +1 -1
- package/error/MustBeEntityError.js +1 -1
- package/error/MustBeEntityError.js.map +1 -1
- package/error/NamingStrategyNotFoundError.js +2 -2
- package/error/NamingStrategyNotFoundError.js.map +1 -1
- package/error/NoConnectionForRepositoryError.js +1 -1
- package/error/NoConnectionForRepositoryError.js.map +1 -1
- package/error/NoConnectionOptionError.js +2 -2
- package/error/NoConnectionOptionError.js.map +1 -1
- package/error/NoVersionOrUpdateDateColumnError.js +1 -1
- package/error/NoVersionOrUpdateDateColumnError.js.map +1 -1
- package/error/OptimisticLockVersionMismatchError.js +1 -1
- package/error/OptimisticLockVersionMismatchError.js.map +1 -1
- package/error/PrimaryColumnCannotBeNullableError.js +1 -1
- package/error/PrimaryColumnCannotBeNullableError.js.map +1 -1
- package/error/RepositoryNotFoundError.js +2 -2
- package/error/RepositoryNotFoundError.js.map +1 -1
- package/error/RepositoryNotTreeError.js +1 -1
- package/error/RepositoryNotTreeError.js.map +1 -1
- package/error/SubjectRemovedAndUpdatedError.js +1 -1
- package/error/SubjectRemovedAndUpdatedError.js.map +1 -1
- package/error/SubjectWithoutIdentifierError.js +1 -1
- package/error/SubjectWithoutIdentifierError.js.map +1 -1
- package/error/TreeRepositoryNotSupportedError.js +1 -1
- package/error/TreeRepositoryNotSupportedError.js.map +1 -1
- package/error/UsingJoinColumnIsNotAllowedError.js +1 -1
- package/error/UsingJoinColumnIsNotAllowedError.js.map +1 -1
- package/error/UsingJoinColumnOnlyOnOneSideAllowedError.js +1 -1
- package/error/UsingJoinColumnOnlyOnOneSideAllowedError.js.map +1 -1
- package/error/UsingJoinTableIsNotAllowedError.js +2 -2
- package/error/UsingJoinTableIsNotAllowedError.js.map +1 -1
- package/error/UsingJoinTableOnlyOnOneSideAllowedError.js +1 -1
- package/error/UsingJoinTableOnlyOnOneSideAllowedError.js.map +1 -1
- package/find-options/FindOptionsUtils.js +6 -6
- package/find-options/FindOptionsUtils.js.map +1 -1
- package/logger/FileLogger.js +3 -3
- package/logger/FileLogger.js.map +1 -1
- package/metadata/EmbeddedMetadata.js +1 -1
- package/metadata/EmbeddedMetadata.js.map +1 -1
- package/metadata/IndexMetadata.js +1 -1
- package/metadata/IndexMetadata.js.map +1 -1
- package/metadata/RelationCountMetadata.js +1 -1
- package/metadata/RelationCountMetadata.js.map +1 -1
- package/metadata/RelationIdMetadata.js +1 -1
- package/metadata/RelationIdMetadata.js.map +1 -1
- package/metadata/UniqueMetadata.js +1 -1
- package/metadata/UniqueMetadata.js.map +1 -1
- package/metadata-builder/EntityMetadataBuilder.js +1 -1
- package/metadata-builder/EntityMetadataBuilder.js.map +1 -1
- package/metadata-builder/EntityMetadataValidator.js +9 -9
- package/metadata-builder/EntityMetadataValidator.js.map +1 -1
- package/metadata-builder/JunctionEntityMetadataBuilder.js +2 -2
- package/metadata-builder/JunctionEntityMetadataBuilder.js.map +1 -1
- package/metadata-builder/RelationJoinColumnBuilder.js +1 -1
- package/metadata-builder/RelationJoinColumnBuilder.js.map +1 -1
- package/migration/MigrationExecutor.js +16 -16
- package/migration/MigrationExecutor.js.map +1 -1
- package/naming-strategy/DefaultNamingStrategy.js +11 -11
- package/naming-strategy/DefaultNamingStrategy.js.map +1 -1
- package/package.json +260 -1
- package/persistence/tree/ClosureSubjectExecutor.js +17 -17
- package/persistence/tree/ClosureSubjectExecutor.js.map +1 -1
- package/persistence/tree/MaterializedPathSubjectExecutor.js +2 -2
- package/persistence/tree/MaterializedPathSubjectExecutor.js.map +1 -1
- package/persistence/tree/NestedSetSubjectExecutor.js +44 -44
- package/persistence/tree/NestedSetSubjectExecutor.js.map +1 -1
- package/platform/PlatformTools.js +1 -1
- package/platform/PlatformTools.js.map +1 -1
- package/query-builder/Alias.js +1 -1
- package/query-builder/Alias.js.map +1 -1
- package/query-builder/DeleteQueryBuilder.js +3 -3
- package/query-builder/DeleteQueryBuilder.js.map +1 -1
- package/query-builder/InsertQueryBuilder.js +22 -22
- package/query-builder/InsertQueryBuilder.js.map +1 -1
- package/query-builder/JoinAttribute.js +1 -1
- package/query-builder/JoinAttribute.js.map +1 -1
- package/query-builder/QueryBuilder.js +39 -39
- package/query-builder/QueryBuilder.js.map +1 -1
- package/query-builder/QueryExpressionMap.js +2 -2
- package/query-builder/QueryExpressionMap.js.map +1 -1
- package/query-builder/RelationLoader.js +7 -7
- package/query-builder/RelationLoader.js.map +1 -1
- package/query-builder/RelationQueryBuilder.js +3 -3
- package/query-builder/RelationQueryBuilder.js.map +1 -1
- package/query-builder/RelationRemover.js +4 -4
- package/query-builder/RelationRemover.js.map +1 -1
- package/query-builder/RelationUpdater.js +1 -1
- package/query-builder/RelationUpdater.js.map +1 -1
- package/query-builder/SelectQueryBuilder.js +23 -23
- package/query-builder/SelectQueryBuilder.js.map +1 -1
- package/query-builder/SoftDeleteQueryBuilder.js +4 -4
- package/query-builder/SoftDeleteQueryBuilder.js.map +1 -1
- package/query-builder/UpdateQueryBuilder.js +8 -8
- package/query-builder/UpdateQueryBuilder.js.map +1 -1
- package/query-builder/relation-count/RelationCountAttribute.js +1 -1
- package/query-builder/relation-count/RelationCountAttribute.js.map +1 -1
- package/query-builder/relation-id/RelationIdAttribute.js +1 -1
- package/query-builder/relation-id/RelationIdAttribute.js.map +1 -1
- package/query-builder/relation-id/RelationIdLoader.js +4 -4
- package/query-builder/relation-id/RelationIdLoader.js.map +1 -1
- package/query-runner/BaseQueryRunner.js +7 -7
- package/query-runner/BaseQueryRunner.js.map +1 -1
- package/repository/TreeRepository.js +7 -7
- package/repository/TreeRepository.js.map +1 -1
- package/schema-builder/RdbmsSchemaBuilder.js +19 -19
- package/schema-builder/RdbmsSchemaBuilder.js.map +1 -1
- package/subscriber/Broadcaster.js +1 -1
- package/subscriber/Broadcaster.js.map +1 -1
- package/util/DateUtils.js +1 -1
- package/util/DateUtils.js.map +1 -1
- package/util/DepGraph.js +7 -7
- package/util/DepGraph.js.map +1 -1
- package/util/DirectoryExportedClassesLoader.js +2 -2
- package/util/DirectoryExportedClassesLoader.js.map +1 -1
- package/util/PathUtils.js +1 -1
- package/util/PathUtils.js.map +1 -1
|
@@ -101,7 +101,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
101
101
|
case 7:
|
|
102
102
|
_a.sent();
|
|
103
103
|
return [3 /*break*/, 10];
|
|
104
|
-
case 8: return [4 /*yield*/, this.query("SAVEPOINT typeorm_"
|
|
104
|
+
case 8: return [4 /*yield*/, this.query("SAVEPOINT typeorm_".concat(this.transactionDepth))];
|
|
105
105
|
case 9:
|
|
106
106
|
_a.sent();
|
|
107
107
|
_a.label = 10;
|
|
@@ -130,7 +130,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
130
130
|
case 1:
|
|
131
131
|
_a.sent();
|
|
132
132
|
if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
|
|
133
|
-
return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_"
|
|
133
|
+
return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
|
|
134
134
|
case 2:
|
|
135
135
|
_a.sent();
|
|
136
136
|
return [3 /*break*/, 5];
|
|
@@ -164,7 +164,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
164
164
|
case 1:
|
|
165
165
|
_a.sent();
|
|
166
166
|
if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
|
|
167
|
-
return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_"
|
|
167
|
+
return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
|
|
168
168
|
case 2:
|
|
169
169
|
_a.sent();
|
|
170
170
|
return [3 /*break*/, 5];
|
|
@@ -308,7 +308,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
308
308
|
var result;
|
|
309
309
|
return __generator(this, function (_a) {
|
|
310
310
|
switch (_a.label) {
|
|
311
|
-
case 0: return [4 /*yield*/, this.query("SELECT * FROM `INFORMATION_SCHEMA`.`SCHEMATA` WHERE `SCHEMA_NAME` = '"
|
|
311
|
+
case 0: return [4 /*yield*/, this.query("SELECT * FROM `INFORMATION_SCHEMA`.`SCHEMATA` WHERE `SCHEMA_NAME` = '".concat(database, "'"))];
|
|
312
312
|
case 1:
|
|
313
313
|
result = _a.sent();
|
|
314
314
|
return [2 /*return*/, result.length ? true : false];
|
|
@@ -368,7 +368,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
368
368
|
switch (_a.label) {
|
|
369
369
|
case 0:
|
|
370
370
|
parsedTableName = this.driver.parseTableName(tableOrName);
|
|
371
|
-
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '"
|
|
371
|
+
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '".concat(parsedTableName.database, "' AND `TABLE_NAME` = '").concat(parsedTableName.tableName, "'");
|
|
372
372
|
return [4 /*yield*/, this.query(sql)];
|
|
373
373
|
case 1:
|
|
374
374
|
result = _a.sent();
|
|
@@ -388,7 +388,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
388
388
|
case 0:
|
|
389
389
|
parsedTableName = this.driver.parseTableName(tableOrName);
|
|
390
390
|
columnName = column instanceof TableColumn ? column.name : column;
|
|
391
|
-
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '"
|
|
391
|
+
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '".concat(parsedTableName.database, "' AND `TABLE_NAME` = '").concat(parsedTableName.tableName, "' AND `COLUMN_NAME` = '").concat(columnName, "'");
|
|
392
392
|
return [4 /*yield*/, this.query(sql)];
|
|
393
393
|
case 1:
|
|
394
394
|
result = _a.sent();
|
|
@@ -406,8 +406,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
406
406
|
return __generator(this, function (_a) {
|
|
407
407
|
switch (_a.label) {
|
|
408
408
|
case 0:
|
|
409
|
-
up = ifNotExist ? "CREATE DATABASE IF NOT EXISTS `"
|
|
410
|
-
down = "DROP DATABASE `"
|
|
409
|
+
up = ifNotExist ? "CREATE DATABASE IF NOT EXISTS `".concat(database, "`") : "CREATE DATABASE `".concat(database, "`");
|
|
410
|
+
down = "DROP DATABASE `".concat(database, "`");
|
|
411
411
|
return [4 /*yield*/, this.executeQueries(new Query(up), new Query(down))];
|
|
412
412
|
case 1:
|
|
413
413
|
_a.sent();
|
|
@@ -425,8 +425,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
425
425
|
return __generator(this, function (_a) {
|
|
426
426
|
switch (_a.label) {
|
|
427
427
|
case 0:
|
|
428
|
-
up = ifExist ? "DROP DATABASE IF EXISTS `"
|
|
429
|
-
down = "CREATE DATABASE `"
|
|
428
|
+
up = ifExist ? "DROP DATABASE IF EXISTS `".concat(database, "`") : "DROP DATABASE `".concat(database, "`");
|
|
429
|
+
down = "CREATE DATABASE `".concat(database, "`");
|
|
430
430
|
return [4 /*yield*/, this.executeQueries(new Query(up), new Query(down))];
|
|
431
431
|
case 1:
|
|
432
432
|
_a.sent();
|
|
@@ -617,14 +617,14 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
617
617
|
oldTable = _a;
|
|
618
618
|
newTable = oldTable.clone();
|
|
619
619
|
database = this.driver.parseTableName(oldTable).database;
|
|
620
|
-
newTable.name = database ? database
|
|
620
|
+
newTable.name = database ? "".concat(database, ".").concat(newTableName) : newTableName;
|
|
621
621
|
// rename table
|
|
622
|
-
upQueries.push(new Query("RENAME TABLE "
|
|
623
|
-
downQueries.push(new Query("RENAME TABLE "
|
|
622
|
+
upQueries.push(new Query("RENAME TABLE ".concat(this.escapePath(oldTable), " TO ").concat(this.escapePath(newTable))));
|
|
623
|
+
downQueries.push(new Query("RENAME TABLE ".concat(this.escapePath(newTable), " TO ").concat(this.escapePath(oldTable))));
|
|
624
624
|
// rename index constraints
|
|
625
625
|
newTable.indices.forEach(function (index) {
|
|
626
626
|
// build new constraint name
|
|
627
|
-
var columnNames = index.columnNames.map(function (column) { return "`"
|
|
627
|
+
var columnNames = index.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
628
628
|
var newIndexName = _this.connection.namingStrategy.indexName(newTable, index.columnNames, index.where);
|
|
629
629
|
// build queries
|
|
630
630
|
var indexType = "";
|
|
@@ -634,31 +634,31 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
634
634
|
indexType += "SPATIAL ";
|
|
635
635
|
if (index.isFulltext)
|
|
636
636
|
indexType += "FULLTEXT ";
|
|
637
|
-
var indexParser = index.isFulltext && index.parser ? " WITH PARSER "
|
|
638
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
639
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
637
|
+
var indexParser = index.isFulltext && index.parser ? " WITH PARSER ".concat(index.parser) : "";
|
|
638
|
+
upQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(newTable), " DROP INDEX `").concat(index.name, "`, ADD ").concat(indexType, "INDEX `").concat(newIndexName, "` (").concat(columnNames, ")").concat(indexParser)));
|
|
639
|
+
downQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(newTable), " DROP INDEX `").concat(newIndexName, "`, ADD ").concat(indexType, "INDEX `").concat(index.name, "` (").concat(columnNames, ")").concat(indexParser)));
|
|
640
640
|
// replace constraint name
|
|
641
641
|
index.name = newIndexName;
|
|
642
642
|
});
|
|
643
643
|
// rename foreign key constraint
|
|
644
644
|
newTable.foreignKeys.forEach(function (foreignKey) {
|
|
645
645
|
// build new constraint name
|
|
646
|
-
var columnNames = foreignKey.columnNames.map(function (column) { return "`"
|
|
647
|
-
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`"
|
|
646
|
+
var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
647
|
+
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
|
|
648
648
|
var newForeignKeyName = _this.connection.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames, _this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
|
|
649
649
|
// build queries
|
|
650
|
-
var up = "ALTER TABLE "
|
|
651
|
-
|
|
650
|
+
var up = "ALTER TABLE ".concat(_this.escapePath(newTable), " DROP FOREIGN KEY `").concat(foreignKey.name, "`, ADD CONSTRAINT `").concat(newForeignKeyName, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
651
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
652
652
|
if (foreignKey.onDelete)
|
|
653
|
-
up += " ON DELETE "
|
|
653
|
+
up += " ON DELETE ".concat(foreignKey.onDelete);
|
|
654
654
|
if (foreignKey.onUpdate)
|
|
655
|
-
up += " ON UPDATE "
|
|
656
|
-
var down = "ALTER TABLE "
|
|
657
|
-
|
|
655
|
+
up += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
656
|
+
var down = "ALTER TABLE ".concat(_this.escapePath(newTable), " DROP FOREIGN KEY `").concat(newForeignKeyName, "`, ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
657
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
658
658
|
if (foreignKey.onDelete)
|
|
659
|
-
down += " ON DELETE "
|
|
659
|
+
down += " ON DELETE ".concat(foreignKey.onDelete);
|
|
660
660
|
if (foreignKey.onUpdate)
|
|
661
|
-
down += " ON UPDATE "
|
|
661
|
+
down += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
662
662
|
upQueries.push(new Query(up));
|
|
663
663
|
downQueries.push(new Query(down));
|
|
664
664
|
// replace constraint name
|
|
@@ -697,8 +697,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
697
697
|
upQueries = [];
|
|
698
698
|
downQueries = [];
|
|
699
699
|
skipColumnLevelPrimary = clonedTable.primaryColumns.length > 0;
|
|
700
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
701
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
700
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(column, skipColumnLevelPrimary, false))));
|
|
701
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN `").concat(column.name, "`")));
|
|
702
702
|
// create or update primary key constraint
|
|
703
703
|
if (column.isPrimary && skipColumnLevelPrimary) {
|
|
704
704
|
generatedColumn = clonedTable.columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
|
|
@@ -706,24 +706,24 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
706
706
|
nonGeneratedColumn = generatedColumn.clone();
|
|
707
707
|
nonGeneratedColumn.isGenerated = false;
|
|
708
708
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
709
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
710
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
709
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(column.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
710
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(column, true))));
|
|
711
711
|
}
|
|
712
712
|
primaryColumns = clonedTable.primaryColumns;
|
|
713
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
714
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
715
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
713
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
714
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
715
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
716
716
|
primaryColumns.push(column);
|
|
717
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
718
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
719
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
717
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
718
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
719
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
720
720
|
// if we previously dropped AUTO_INCREMENT property, we must bring it back
|
|
721
721
|
if (generatedColumn) {
|
|
722
722
|
nonGeneratedColumn = generatedColumn.clone();
|
|
723
723
|
nonGeneratedColumn.isGenerated = false;
|
|
724
724
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
725
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
726
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
725
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(column, true))));
|
|
726
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(column.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
727
727
|
}
|
|
728
728
|
}
|
|
729
729
|
columnIndex = clonedTable.indices.find(function (index) { return index.columnNames.length === 1 && index.columnNames[0] === column.name; });
|
|
@@ -742,8 +742,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
742
742
|
name: uniqueIndex.name,
|
|
743
743
|
columnNames: uniqueIndex.columnNames
|
|
744
744
|
}));
|
|
745
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
746
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
745
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex.name, "` (`").concat(column.name, "`)")));
|
|
746
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex.name, "`")));
|
|
747
747
|
}
|
|
748
748
|
return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
|
|
749
749
|
case 4:
|
|
@@ -814,7 +814,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
814
814
|
table = _a;
|
|
815
815
|
oldColumn = oldTableColumnOrName instanceof TableColumn ? oldTableColumnOrName : table.columns.find(function (c) { return c.name === oldTableColumnOrName; });
|
|
816
816
|
if (!oldColumn)
|
|
817
|
-
throw new TypeORMError("Column \""
|
|
817
|
+
throw new TypeORMError("Column \"".concat(oldTableColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
|
|
818
818
|
newColumn = undefined;
|
|
819
819
|
if (newTableColumnOrName instanceof TableColumn) {
|
|
820
820
|
newColumn = newTableColumnOrName;
|
|
@@ -857,7 +857,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
857
857
|
? oldColumnOrName
|
|
858
858
|
: table.columns.find(function (column) { return column.name === oldColumnOrName; });
|
|
859
859
|
if (!oldColumn)
|
|
860
|
-
throw new TypeORMError("Column \""
|
|
860
|
+
throw new TypeORMError("Column \"".concat(oldColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
|
|
861
861
|
if (!((newColumn.isGenerated !== oldColumn.isGenerated && newColumn.generationStrategy !== "uuid")
|
|
862
862
|
|| oldColumn.type !== newColumn.type
|
|
863
863
|
|| oldColumn.length !== newColumn.length
|
|
@@ -874,14 +874,14 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
874
874
|
case 6:
|
|
875
875
|
if (newColumn.name !== oldColumn.name) {
|
|
876
876
|
// We don't change any column properties, just rename it.
|
|
877
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
878
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
877
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(oldColumn.name, "` `").concat(newColumn.name, "` ").concat(this.buildCreateColumnSql(oldColumn, true, true))));
|
|
878
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(newColumn.name, "` `").concat(oldColumn.name, "` ").concat(this.buildCreateColumnSql(oldColumn, true, true))));
|
|
879
879
|
// rename index constraints
|
|
880
880
|
clonedTable.findColumnIndices(oldColumn).forEach(function (index) {
|
|
881
881
|
// build new constraint name
|
|
882
882
|
index.columnNames.splice(index.columnNames.indexOf(oldColumn.name), 1);
|
|
883
883
|
index.columnNames.push(newColumn.name);
|
|
884
|
-
var columnNames = index.columnNames.map(function (column) { return "`"
|
|
884
|
+
var columnNames = index.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
885
885
|
var newIndexName = _this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
|
|
886
886
|
// build queries
|
|
887
887
|
var indexType = "";
|
|
@@ -891,9 +891,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
891
891
|
indexType += "SPATIAL ";
|
|
892
892
|
if (index.isFulltext)
|
|
893
893
|
indexType += "FULLTEXT ";
|
|
894
|
-
var indexParser = index.isFulltext && index.parser ? " WITH PARSER "
|
|
895
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
896
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
894
|
+
var indexParser = index.isFulltext && index.parser ? " WITH PARSER ".concat(index.parser) : "";
|
|
895
|
+
upQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(table), " DROP INDEX `").concat(index.name, "`, ADD ").concat(indexType, "INDEX `").concat(newIndexName, "` (").concat(columnNames, ")").concat(indexParser)));
|
|
896
|
+
downQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(table), " DROP INDEX `").concat(newIndexName, "`, ADD ").concat(indexType, "INDEX `").concat(index.name, "` (").concat(columnNames, ")").concat(indexParser)));
|
|
897
897
|
// replace constraint name
|
|
898
898
|
index.name = newIndexName;
|
|
899
899
|
});
|
|
@@ -902,22 +902,22 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
902
902
|
// build new constraint name
|
|
903
903
|
foreignKey.columnNames.splice(foreignKey.columnNames.indexOf(oldColumn.name), 1);
|
|
904
904
|
foreignKey.columnNames.push(newColumn.name);
|
|
905
|
-
var columnNames = foreignKey.columnNames.map(function (column) { return "`"
|
|
906
|
-
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`"
|
|
905
|
+
var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
906
|
+
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
|
|
907
907
|
var newForeignKeyName = _this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, _this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
|
|
908
908
|
// build queries
|
|
909
|
-
var up = "ALTER TABLE "
|
|
910
|
-
|
|
909
|
+
var up = "ALTER TABLE ".concat(_this.escapePath(table), " DROP FOREIGN KEY `").concat(foreignKey.name, "`, ADD CONSTRAINT `").concat(newForeignKeyName, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
910
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
911
911
|
if (foreignKey.onDelete)
|
|
912
|
-
up += " ON DELETE "
|
|
912
|
+
up += " ON DELETE ".concat(foreignKey.onDelete);
|
|
913
913
|
if (foreignKey.onUpdate)
|
|
914
|
-
up += " ON UPDATE "
|
|
915
|
-
var down = "ALTER TABLE "
|
|
916
|
-
|
|
914
|
+
up += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
915
|
+
var down = "ALTER TABLE ".concat(_this.escapePath(table), " DROP FOREIGN KEY `").concat(newForeignKeyName, "`, ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
916
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
917
917
|
if (foreignKey.onDelete)
|
|
918
|
-
down += " ON DELETE "
|
|
918
|
+
down += " ON DELETE ".concat(foreignKey.onDelete);
|
|
919
919
|
if (foreignKey.onUpdate)
|
|
920
|
-
down += " ON UPDATE "
|
|
920
|
+
down += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
921
921
|
upQueries.push(new Query(up));
|
|
922
922
|
downQueries.push(new Query(down));
|
|
923
923
|
// replace constraint name
|
|
@@ -928,8 +928,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
928
928
|
oldColumn.name = newColumn.name;
|
|
929
929
|
}
|
|
930
930
|
if (this.isColumnChanged(oldColumn, newColumn, true, true)) {
|
|
931
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
932
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
931
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(oldColumn.name, "` ").concat(this.buildCreateColumnSql(newColumn, true))));
|
|
932
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(newColumn.name, "` ").concat(this.buildCreateColumnSql(oldColumn, true))));
|
|
933
933
|
}
|
|
934
934
|
if (newColumn.isPrimary !== oldColumn.isPrimary) {
|
|
935
935
|
generatedColumn = clonedTable.columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
|
|
@@ -937,23 +937,23 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
937
937
|
nonGeneratedColumn = generatedColumn.clone();
|
|
938
938
|
nonGeneratedColumn.isGenerated = false;
|
|
939
939
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
940
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
941
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
940
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
941
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
942
942
|
}
|
|
943
943
|
primaryColumns = clonedTable.primaryColumns;
|
|
944
944
|
// if primary column state changed, we must always drop existed constraint.
|
|
945
945
|
if (primaryColumns.length > 0) {
|
|
946
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
947
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
948
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
946
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
947
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
948
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
949
949
|
}
|
|
950
950
|
if (newColumn.isPrimary === true) {
|
|
951
951
|
primaryColumns.push(newColumn);
|
|
952
952
|
column = clonedTable.columns.find(function (column) { return column.name === newColumn.name; });
|
|
953
953
|
column.isPrimary = true;
|
|
954
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
955
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
956
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
954
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
955
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
956
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
957
957
|
}
|
|
958
958
|
else {
|
|
959
959
|
primaryColumn = primaryColumns.find(function (c) { return c.name === newColumn.name; });
|
|
@@ -962,9 +962,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
962
962
|
column.isPrimary = false;
|
|
963
963
|
// if we have another primary keys, we must recreate constraint.
|
|
964
964
|
if (primaryColumns.length > 0) {
|
|
965
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
966
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
967
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
965
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
966
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
967
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
968
968
|
}
|
|
969
969
|
}
|
|
970
970
|
// if we have generated column, and we dropped AUTO_INCREMENT property before, we must bring it back
|
|
@@ -972,8 +972,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
972
972
|
nonGeneratedColumn = generatedColumn.clone();
|
|
973
973
|
nonGeneratedColumn.isGenerated = false;
|
|
974
974
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
975
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
976
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
975
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
976
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
977
977
|
}
|
|
978
978
|
}
|
|
979
979
|
if (newColumn.isUnique !== oldColumn.isUnique) {
|
|
@@ -988,8 +988,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
988
988
|
name: uniqueIndex.name,
|
|
989
989
|
columnNames: uniqueIndex.columnNames
|
|
990
990
|
}));
|
|
991
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
992
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
991
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex.name, "` (`").concat(newColumn.name, "`)")));
|
|
992
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex.name, "`")));
|
|
993
993
|
}
|
|
994
994
|
else {
|
|
995
995
|
uniqueIndex_1 = clonedTable.indices.find(function (index) {
|
|
@@ -998,8 +998,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
998
998
|
clonedTable.indices.splice(clonedTable.indices.indexOf(uniqueIndex_1), 1);
|
|
999
999
|
tableUnique = clonedTable.uniques.find(function (unique) { return unique.name === uniqueIndex_1.name; });
|
|
1000
1000
|
clonedTable.uniques.splice(clonedTable.uniques.indexOf(tableUnique), 1);
|
|
1001
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1002
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1001
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex_1.name, "`")));
|
|
1002
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex_1.name, "` (`").concat(newColumn.name, "`)")));
|
|
1003
1003
|
}
|
|
1004
1004
|
}
|
|
1005
1005
|
_b.label = 7;
|
|
@@ -1071,7 +1071,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1071
1071
|
table = _a;
|
|
1072
1072
|
column = columnOrName instanceof TableColumn ? columnOrName : table.findColumnByName(columnOrName);
|
|
1073
1073
|
if (!column)
|
|
1074
|
-
throw new TypeORMError("Column \""
|
|
1074
|
+
throw new TypeORMError("Column \"".concat(columnOrName, "\" was not found in table \"").concat(table.name, "\""));
|
|
1075
1075
|
clonedTable = table.clone();
|
|
1076
1076
|
upQueries = [];
|
|
1077
1077
|
downQueries = [];
|
|
@@ -1082,27 +1082,27 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1082
1082
|
nonGeneratedColumn = generatedColumn.clone();
|
|
1083
1083
|
nonGeneratedColumn.isGenerated = false;
|
|
1084
1084
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1085
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1086
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1085
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1086
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
1087
1087
|
}
|
|
1088
|
-
columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "`"
|
|
1089
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1090
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1088
|
+
columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "`".concat(primaryColumn.name, "`"); }).join(", ");
|
|
1089
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP PRIMARY KEY")));
|
|
1090
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
1091
1091
|
tableColumn = clonedTable.findColumnByName(column.name);
|
|
1092
1092
|
tableColumn.isPrimary = false;
|
|
1093
1093
|
// if primary key have multiple columns, we must recreate it without dropped column
|
|
1094
1094
|
if (clonedTable.primaryColumns.length > 0) {
|
|
1095
|
-
columnNames_1 = clonedTable.primaryColumns.map(function (primaryColumn) { return "`"
|
|
1096
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1097
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1095
|
+
columnNames_1 = clonedTable.primaryColumns.map(function (primaryColumn) { return "`".concat(primaryColumn.name, "`"); }).join(", ");
|
|
1096
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD PRIMARY KEY (").concat(columnNames_1, ")")));
|
|
1097
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP PRIMARY KEY")));
|
|
1098
1098
|
}
|
|
1099
1099
|
// if we have generated column, and we dropped AUTO_INCREMENT property before, and this column is not current dropping column, we must bring it back
|
|
1100
1100
|
if (generatedColumn && generatedColumn.name !== column.name) {
|
|
1101
1101
|
nonGeneratedColumn = generatedColumn.clone();
|
|
1102
1102
|
nonGeneratedColumn.isGenerated = false;
|
|
1103
1103
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1104
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1105
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1104
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
1105
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1106
1106
|
}
|
|
1107
1107
|
}
|
|
1108
1108
|
columnIndex = clonedTable.indices.find(function (index) { return index.columnNames.length === 1 && index.columnNames[0] === column.name; });
|
|
@@ -1120,11 +1120,11 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1120
1120
|
foundIndex = clonedTable.indices.find(function (index) { return index.name === indexName_1; });
|
|
1121
1121
|
if (foundIndex)
|
|
1122
1122
|
clonedTable.indices.splice(clonedTable.indices.indexOf(foundIndex), 1);
|
|
1123
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1124
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1123
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(indexName_1, "`")));
|
|
1124
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(indexName_1, "` (`").concat(column.name, "`)")));
|
|
1125
1125
|
}
|
|
1126
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1127
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1126
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN `").concat(column.name, "`")));
|
|
1127
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(column, true))));
|
|
1128
1128
|
return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
|
|
1129
1129
|
case 4:
|
|
1130
1130
|
_b.sent();
|
|
@@ -1235,29 +1235,29 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1235
1235
|
nonGeneratedColumn = generatedColumn.clone();
|
|
1236
1236
|
nonGeneratedColumn.isGenerated = false;
|
|
1237
1237
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1238
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1239
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1238
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1239
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
1240
1240
|
}
|
|
1241
1241
|
primaryColumns = clonedTable.primaryColumns;
|
|
1242
1242
|
if (primaryColumns.length > 0) {
|
|
1243
|
-
columnNames_2 = primaryColumns.map(function (column) { return "`"
|
|
1244
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1245
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1243
|
+
columnNames_2 = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
1244
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
1245
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames_2, ")")));
|
|
1246
1246
|
}
|
|
1247
1247
|
// update columns in table.
|
|
1248
1248
|
clonedTable.columns
|
|
1249
1249
|
.filter(function (column) { return columnNames.indexOf(column.name) !== -1; })
|
|
1250
1250
|
.forEach(function (column) { return column.isPrimary = true; });
|
|
1251
|
-
columnNamesString = columnNames.map(function (columnName) { return "`"
|
|
1252
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1253
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1251
|
+
columnNamesString = columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
1252
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNamesString, ")")));
|
|
1253
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
1254
1254
|
newOrExistGeneratedColumn = generatedColumn ? generatedColumn : columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
|
|
1255
1255
|
if (newOrExistGeneratedColumn) {
|
|
1256
1256
|
nonGeneratedColumn = newOrExistGeneratedColumn.clone();
|
|
1257
1257
|
nonGeneratedColumn.isGenerated = false;
|
|
1258
1258
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1259
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1260
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1259
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(newOrExistGeneratedColumn, true))));
|
|
1260
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(newOrExistGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1261
1261
|
changedGeneratedColumn = clonedTable.columns.find(function (column) { return column.name === newOrExistGeneratedColumn.name; });
|
|
1262
1262
|
changedGeneratedColumn.isGenerated = true;
|
|
1263
1263
|
changedGeneratedColumn.generationStrategy = "increment";
|
|
@@ -1493,7 +1493,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1493
1493
|
table = _a;
|
|
1494
1494
|
foreignKey = foreignKeyOrName instanceof TableForeignKey ? foreignKeyOrName : table.foreignKeys.find(function (fk) { return fk.name === foreignKeyOrName; });
|
|
1495
1495
|
if (!foreignKey)
|
|
1496
|
-
throw new TypeORMError("Supplied foreign key was not found in table "
|
|
1496
|
+
throw new TypeORMError("Supplied foreign key was not found in table ".concat(table.name));
|
|
1497
1497
|
up = this.dropForeignKeySql(table, foreignKey);
|
|
1498
1498
|
down = this.createForeignKeySql(table, foreignKey);
|
|
1499
1499
|
return [4 /*yield*/, this.executeQueries(up, down)];
|
|
@@ -1595,7 +1595,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1595
1595
|
table = _a;
|
|
1596
1596
|
index = indexOrName instanceof TableIndex ? indexOrName : table.indices.find(function (i) { return i.name === indexOrName; });
|
|
1597
1597
|
if (!index)
|
|
1598
|
-
throw new TypeORMError("Supplied index "
|
|
1598
|
+
throw new TypeORMError("Supplied index ".concat(indexOrName, " was not found in table ").concat(table.name));
|
|
1599
1599
|
up = this.dropIndexSql(table, index);
|
|
1600
1600
|
down = this.createIndexSql(table, index);
|
|
1601
1601
|
return [4 /*yield*/, this.executeQueries(up, down)];
|
|
@@ -1634,7 +1634,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1634
1634
|
return __awaiter(this, void 0, void 0, function () {
|
|
1635
1635
|
return __generator(this, function (_a) {
|
|
1636
1636
|
switch (_a.label) {
|
|
1637
|
-
case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE "
|
|
1637
|
+
case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE ".concat(this.escapePath(tableOrName)))];
|
|
1638
1638
|
case 1:
|
|
1639
1639
|
_a.sent();
|
|
1640
1640
|
return [2 /*return*/];
|
|
@@ -1672,7 +1672,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1672
1672
|
_a.label = 5;
|
|
1673
1673
|
case 5:
|
|
1674
1674
|
_a.trys.push([5, 14, , 20]);
|
|
1675
|
-
selectViewDropsQuery = "SELECT concat('DROP VIEW IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`VIEWS` WHERE `TABLE_SCHEMA` = '"
|
|
1675
|
+
selectViewDropsQuery = "SELECT concat('DROP VIEW IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`VIEWS` WHERE `TABLE_SCHEMA` = '".concat(dbName, "'");
|
|
1676
1676
|
return [4 /*yield*/, this.query(selectViewDropsQuery)];
|
|
1677
1677
|
case 6:
|
|
1678
1678
|
dropViewQueries = _a.sent();
|
|
@@ -1680,7 +1680,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1680
1680
|
case 7:
|
|
1681
1681
|
_a.sent();
|
|
1682
1682
|
disableForeignKeysCheckQuery = "SET FOREIGN_KEY_CHECKS = 0;";
|
|
1683
|
-
dropTablesQuery = "SELECT concat('DROP TABLE IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA` = '"
|
|
1683
|
+
dropTablesQuery = "SELECT concat('DROP TABLE IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA` = '".concat(dbName, "'");
|
|
1684
1684
|
enableForeignKeysCheckQuery = "SET FOREIGN_KEY_CHECKS = 1;";
|
|
1685
1685
|
return [4 /*yield*/, this.query(disableForeignKeysCheckQuery)];
|
|
1686
1686
|
case 8:
|
|
@@ -1746,10 +1746,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1746
1746
|
if (!database) {
|
|
1747
1747
|
database = currentDatabase;
|
|
1748
1748
|
}
|
|
1749
|
-
return "(`t`.`schema` = '"
|
|
1749
|
+
return "(`t`.`schema` = '".concat(database, "' AND `t`.`name` = '").concat(name, "')");
|
|
1750
1750
|
}).join(" OR ");
|
|
1751
|
-
query = "SELECT `t`.*, `v`.`check_option` FROM "
|
|
1752
|
-
|
|
1751
|
+
query = "SELECT `t`.*, `v`.`check_option` FROM ".concat(this.escapePath(this.getTypeormMetadataTableName()), " `t` ") +
|
|
1752
|
+
"INNER JOIN `information_schema`.`views` `v` ON `v`.`table_schema` = `t`.`schema` AND `v`.`table_name` = `t`.`name` WHERE `t`.`type` = '".concat(MetadataTableType.VIEW, "' ").concat(viewsCondition ? "AND (".concat(viewsCondition, ")") : "");
|
|
1753
1753
|
return [4 /*yield*/, this.query(query)];
|
|
1754
1754
|
case 3:
|
|
1755
1755
|
dbViews = _a.sent();
|
|
@@ -1799,7 +1799,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1799
1799
|
if (!database) {
|
|
1800
1800
|
database = currentDatabase;
|
|
1801
1801
|
}
|
|
1802
|
-
return "\n SELECT `TABLE_SCHEMA`,\n `TABLE_NAME`\n FROM `INFORMATION_SCHEMA`.`TABLES`\n WHERE `TABLE_SCHEMA` = '"
|
|
1802
|
+
return "\n SELECT `TABLE_SCHEMA`,\n `TABLE_NAME`\n FROM `INFORMATION_SCHEMA`.`TABLES`\n WHERE `TABLE_SCHEMA` = '".concat(database, "'\n AND `TABLE_NAME` = '").concat(name, "'\n ");
|
|
1803
1803
|
}).join(" UNION ");
|
|
1804
1804
|
_f = (_e = dbTables.push).apply;
|
|
1805
1805
|
_g = [dbTables];
|
|
@@ -1814,24 +1814,24 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1814
1814
|
return [2 /*return*/, []];
|
|
1815
1815
|
statsSubquerySql = dbTables.map(function (_a) {
|
|
1816
1816
|
var TABLE_SCHEMA = _a.TABLE_SCHEMA, TABLE_NAME = _a.TABLE_NAME;
|
|
1817
|
-
return "\n SELECT\n *\n FROM `INFORMATION_SCHEMA`.`STATISTICS`\n WHERE\n `TABLE_SCHEMA` = '"
|
|
1817
|
+
return "\n SELECT\n *\n FROM `INFORMATION_SCHEMA`.`STATISTICS`\n WHERE\n `TABLE_SCHEMA` = '".concat(TABLE_SCHEMA, "'\n AND\n `TABLE_NAME` = '").concat(TABLE_NAME, "'\n ");
|
|
1818
1818
|
}).join(" UNION ");
|
|
1819
1819
|
kcuSubquerySql = dbTables.map(function (_a) {
|
|
1820
1820
|
var TABLE_SCHEMA = _a.TABLE_SCHEMA, TABLE_NAME = _a.TABLE_NAME;
|
|
1821
|
-
return "\n SELECT\n *\n FROM `INFORMATION_SCHEMA`.`KEY_COLUMN_USAGE` `kcu`\n WHERE\n `kcu`.`TABLE_SCHEMA` = '"
|
|
1821
|
+
return "\n SELECT\n *\n FROM `INFORMATION_SCHEMA`.`KEY_COLUMN_USAGE` `kcu`\n WHERE\n `kcu`.`TABLE_SCHEMA` = '".concat(TABLE_SCHEMA, "'\n AND\n `kcu`.`TABLE_NAME` = '").concat(TABLE_NAME, "'\n ");
|
|
1822
1822
|
}).join(" UNION ");
|
|
1823
1823
|
rcSubquerySql = dbTables.map(function (_a) {
|
|
1824
1824
|
var TABLE_SCHEMA = _a.TABLE_SCHEMA, TABLE_NAME = _a.TABLE_NAME;
|
|
1825
|
-
return "\n SELECT\n *\n FROM `INFORMATION_SCHEMA`.`REFERENTIAL_CONSTRAINTS`\n WHERE\n `CONSTRAINT_SCHEMA` = '"
|
|
1825
|
+
return "\n SELECT\n *\n FROM `INFORMATION_SCHEMA`.`REFERENTIAL_CONSTRAINTS`\n WHERE\n `CONSTRAINT_SCHEMA` = '".concat(TABLE_SCHEMA, "'\n AND\n `TABLE_NAME` = '").concat(TABLE_NAME, "'\n ");
|
|
1826
1826
|
}).join(" UNION ");
|
|
1827
1827
|
columnsSql = dbTables.map(function (_a) {
|
|
1828
1828
|
var TABLE_SCHEMA = _a.TABLE_SCHEMA, TABLE_NAME = _a.TABLE_NAME;
|
|
1829
|
-
return "\n SELECT\n *\n FROM\n `INFORMATION_SCHEMA`.`COLUMNS`\n WHERE\n `TABLE_SCHEMA` = '"
|
|
1829
|
+
return "\n SELECT\n *\n FROM\n `INFORMATION_SCHEMA`.`COLUMNS`\n WHERE\n `TABLE_SCHEMA` = '".concat(TABLE_SCHEMA, "'\n AND\n `TABLE_NAME` = '").concat(TABLE_NAME, "'\n ");
|
|
1830
1830
|
}).join(" UNION ");
|
|
1831
1831
|
collationsSql = "\n SELECT\n `SCHEMA_NAME`,\n `DEFAULT_CHARACTER_SET_NAME` as `CHARSET`,\n `DEFAULT_COLLATION_NAME` AS `COLLATION`\n FROM `INFORMATION_SCHEMA`.`SCHEMATA`\n ";
|
|
1832
|
-
primaryKeySql = "SELECT * FROM ("
|
|
1833
|
-
indicesSql = "\n SELECT\n `s`.*\n FROM ("
|
|
1834
|
-
foreignKeysSql = "\n SELECT\n `kcu`.`TABLE_SCHEMA`,\n `kcu`.`TABLE_NAME`,\n `kcu`.`CONSTRAINT_NAME`,\n `kcu`.`COLUMN_NAME`,\n `kcu`.`REFERENCED_TABLE_SCHEMA`,\n `kcu`.`REFERENCED_TABLE_NAME`,\n `kcu`.`REFERENCED_COLUMN_NAME`,\n `rc`.`DELETE_RULE` `ON_DELETE`,\n `rc`.`UPDATE_RULE` `ON_UPDATE`\n FROM ("
|
|
1832
|
+
primaryKeySql = "SELECT * FROM (".concat(kcuSubquerySql, ") `kcu` WHERE `CONSTRAINT_NAME` = 'PRIMARY'");
|
|
1833
|
+
indicesSql = "\n SELECT\n `s`.*\n FROM (".concat(statsSubquerySql, ") `s`\n LEFT JOIN (").concat(rcSubquerySql, ") `rc`\n ON\n `s`.`INDEX_NAME` = `rc`.`CONSTRAINT_NAME`\n AND\n `s`.`TABLE_SCHEMA` = `rc`.`CONSTRAINT_SCHEMA`\n WHERE\n `s`.`INDEX_NAME` != 'PRIMARY'\n AND\n `rc`.`CONSTRAINT_NAME` IS NULL\n ");
|
|
1834
|
+
foreignKeysSql = "\n SELECT\n `kcu`.`TABLE_SCHEMA`,\n `kcu`.`TABLE_NAME`,\n `kcu`.`CONSTRAINT_NAME`,\n `kcu`.`COLUMN_NAME`,\n `kcu`.`REFERENCED_TABLE_SCHEMA`,\n `kcu`.`REFERENCED_TABLE_NAME`,\n `kcu`.`REFERENCED_COLUMN_NAME`,\n `rc`.`DELETE_RULE` `ON_DELETE`,\n `rc`.`UPDATE_RULE` `ON_UPDATE`\n FROM (".concat(kcuSubquerySql, ") `kcu`\n INNER JOIN (").concat(rcSubquerySql, ") `rc`\n ON\n `rc`.`CONSTRAINT_SCHEMA` = `kcu`.`CONSTRAINT_SCHEMA`\n AND\n `rc`.`TABLE_NAME` = `kcu`.`TABLE_NAME`\n AND\n `rc`.`CONSTRAINT_NAME` = `kcu`.`CONSTRAINT_NAME`\n ");
|
|
1835
1835
|
return [4 /*yield*/, Promise.all([
|
|
1836
1836
|
this.query(columnsSql),
|
|
1837
1837
|
this.query(primaryKeySql),
|
|
@@ -1903,7 +1903,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1903
1903
|
tableColumn.default = dbColumn["COLUMN_DEFAULT"];
|
|
1904
1904
|
}
|
|
1905
1905
|
else {
|
|
1906
|
-
tableColumn.default = "'"
|
|
1906
|
+
tableColumn.default = "'".concat(dbColumn["COLUMN_DEFAULT"], "'");
|
|
1907
1907
|
}
|
|
1908
1908
|
if (dbColumn["EXTRA"].indexOf("on update") !== -1) {
|
|
1909
1909
|
// New versions of MariaDB return expressions in lowercase. We need to set it in
|
|
@@ -2003,7 +2003,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2003
2003
|
MysqlQueryRunner.prototype.createTableSql = function (table, createForeignKeys) {
|
|
2004
2004
|
var _this = this;
|
|
2005
2005
|
var columnDefinitions = table.columns.map(function (column) { return _this.buildCreateColumnSql(column, true); }).join(", ");
|
|
2006
|
-
var sql = "CREATE TABLE "
|
|
2006
|
+
var sql = "CREATE TABLE ".concat(this.escapePath(table), " (").concat(columnDefinitions);
|
|
2007
2007
|
// we create unique indexes instead of unique constraints, because MySql does not have unique constraints.
|
|
2008
2008
|
// if we mark column as Unique, it means that we create UNIQUE INDEX.
|
|
2009
2009
|
table.columns
|
|
@@ -2037,7 +2037,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2037
2037
|
}
|
|
2038
2038
|
if (table.indices.length > 0) {
|
|
2039
2039
|
var indicesSql = table.indices.map(function (index) {
|
|
2040
|
-
var columnNames = index.columnNames.map(function (columnName) { return "`"
|
|
2040
|
+
var columnNames = index.columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2041
2041
|
if (!index.name)
|
|
2042
2042
|
index.name = _this.connection.namingStrategy.indexName(table, index.columnNames, index.where);
|
|
2043
2043
|
var indexType = "";
|
|
@@ -2047,45 +2047,45 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2047
2047
|
indexType += "SPATIAL ";
|
|
2048
2048
|
if (index.isFulltext)
|
|
2049
2049
|
indexType += "FULLTEXT ";
|
|
2050
|
-
var indexParser = index.isFulltext && index.parser ? " WITH PARSER "
|
|
2051
|
-
return indexType
|
|
2050
|
+
var indexParser = index.isFulltext && index.parser ? " WITH PARSER ".concat(index.parser) : "";
|
|
2051
|
+
return "".concat(indexType, "INDEX `").concat(index.name, "` (").concat(columnNames, ")").concat(indexParser);
|
|
2052
2052
|
}).join(", ");
|
|
2053
|
-
sql += ", "
|
|
2053
|
+
sql += ", ".concat(indicesSql);
|
|
2054
2054
|
}
|
|
2055
2055
|
if (table.foreignKeys.length > 0 && createForeignKeys) {
|
|
2056
2056
|
var foreignKeysSql = table.foreignKeys.map(function (fk) {
|
|
2057
|
-
var columnNames = fk.columnNames.map(function (columnName) { return "`"
|
|
2057
|
+
var columnNames = fk.columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2058
2058
|
if (!fk.name)
|
|
2059
2059
|
fk.name = _this.connection.namingStrategy.foreignKeyName(table, fk.columnNames, _this.getTablePath(fk), fk.referencedColumnNames);
|
|
2060
|
-
var referencedColumnNames = fk.referencedColumnNames.map(function (columnName) { return "`"
|
|
2061
|
-
var constraint = "CONSTRAINT `"
|
|
2060
|
+
var referencedColumnNames = fk.referencedColumnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2061
|
+
var constraint = "CONSTRAINT `".concat(fk.name, "` FOREIGN KEY (").concat(columnNames, ") REFERENCES ").concat(_this.escapePath(_this.getTablePath(fk)), " (").concat(referencedColumnNames, ")");
|
|
2062
2062
|
if (fk.onDelete)
|
|
2063
|
-
constraint += " ON DELETE "
|
|
2063
|
+
constraint += " ON DELETE ".concat(fk.onDelete);
|
|
2064
2064
|
if (fk.onUpdate)
|
|
2065
|
-
constraint += " ON UPDATE "
|
|
2065
|
+
constraint += " ON UPDATE ".concat(fk.onUpdate);
|
|
2066
2066
|
return constraint;
|
|
2067
2067
|
}).join(", ");
|
|
2068
|
-
sql += ", "
|
|
2068
|
+
sql += ", ".concat(foreignKeysSql);
|
|
2069
2069
|
}
|
|
2070
2070
|
if (table.primaryColumns.length > 0) {
|
|
2071
|
-
var columnNames = table.primaryColumns.map(function (column) { return "`"
|
|
2072
|
-
sql += ", PRIMARY KEY ("
|
|
2071
|
+
var columnNames = table.primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
2072
|
+
sql += ", PRIMARY KEY (".concat(columnNames, ")");
|
|
2073
2073
|
}
|
|
2074
|
-
sql += ") ENGINE="
|
|
2074
|
+
sql += ") ENGINE=".concat(table.engine || "InnoDB");
|
|
2075
2075
|
return new Query(sql);
|
|
2076
2076
|
};
|
|
2077
2077
|
/**
|
|
2078
2078
|
* Builds drop table sql
|
|
2079
2079
|
*/
|
|
2080
2080
|
MysqlQueryRunner.prototype.dropTableSql = function (tableOrName) {
|
|
2081
|
-
return new Query("DROP TABLE "
|
|
2081
|
+
return new Query("DROP TABLE ".concat(this.escapePath(tableOrName)));
|
|
2082
2082
|
};
|
|
2083
2083
|
MysqlQueryRunner.prototype.createViewSql = function (view) {
|
|
2084
2084
|
if (typeof view.expression === "string") {
|
|
2085
|
-
return new Query("CREATE VIEW "
|
|
2085
|
+
return new Query("CREATE VIEW ".concat(this.escapePath(view), " AS ").concat(view.expression));
|
|
2086
2086
|
}
|
|
2087
2087
|
else {
|
|
2088
|
-
return new Query("CREATE VIEW "
|
|
2088
|
+
return new Query("CREATE VIEW ".concat(this.escapePath(view), " AS ").concat(view.expression(this.connection).getQuery()));
|
|
2089
2089
|
}
|
|
2090
2090
|
};
|
|
2091
2091
|
MysqlQueryRunner.prototype.insertViewDefinitionSql = function (view) {
|
|
@@ -2111,7 +2111,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2111
2111
|
* Builds drop view sql.
|
|
2112
2112
|
*/
|
|
2113
2113
|
MysqlQueryRunner.prototype.dropViewSql = function (viewOrPath) {
|
|
2114
|
-
return new Query("DROP VIEW "
|
|
2114
|
+
return new Query("DROP VIEW ".concat(this.escapePath(viewOrPath)));
|
|
2115
2115
|
};
|
|
2116
2116
|
/**
|
|
2117
2117
|
* Builds remove view sql.
|
|
@@ -2138,7 +2138,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2138
2138
|
* Builds create index sql.
|
|
2139
2139
|
*/
|
|
2140
2140
|
MysqlQueryRunner.prototype.createIndexSql = function (table, index) {
|
|
2141
|
-
var columns = index.columnNames.map(function (columnName) { return "`"
|
|
2141
|
+
var columns = index.columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2142
2142
|
var indexType = "";
|
|
2143
2143
|
if (index.isUnique)
|
|
2144
2144
|
indexType += "UNIQUE ";
|
|
@@ -2146,41 +2146,41 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2146
2146
|
indexType += "SPATIAL ";
|
|
2147
2147
|
if (index.isFulltext)
|
|
2148
2148
|
indexType += "FULLTEXT ";
|
|
2149
|
-
var indexParser = index.isFulltext && index.parser ? " WITH PARSER "
|
|
2150
|
-
return new Query("CREATE "
|
|
2149
|
+
var indexParser = index.isFulltext && index.parser ? " WITH PARSER ".concat(index.parser) : "";
|
|
2150
|
+
return new Query("CREATE ".concat(indexType, "INDEX `").concat(index.name, "` ON ").concat(this.escapePath(table), " (").concat(columns, ")").concat(indexParser));
|
|
2151
2151
|
};
|
|
2152
2152
|
/**
|
|
2153
2153
|
* Builds drop index sql.
|
|
2154
2154
|
*/
|
|
2155
2155
|
MysqlQueryRunner.prototype.dropIndexSql = function (table, indexOrName) {
|
|
2156
2156
|
var indexName = indexOrName instanceof TableIndex ? indexOrName.name : indexOrName;
|
|
2157
|
-
return new Query("DROP INDEX `"
|
|
2157
|
+
return new Query("DROP INDEX `".concat(indexName, "` ON ").concat(this.escapePath(table)));
|
|
2158
2158
|
};
|
|
2159
2159
|
/**
|
|
2160
2160
|
* Builds create primary key sql.
|
|
2161
2161
|
*/
|
|
2162
2162
|
MysqlQueryRunner.prototype.createPrimaryKeySql = function (table, columnNames) {
|
|
2163
|
-
var columnNamesString = columnNames.map(function (columnName) { return "`"
|
|
2164
|
-
return new Query("ALTER TABLE "
|
|
2163
|
+
var columnNamesString = columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2164
|
+
return new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNamesString, ")"));
|
|
2165
2165
|
};
|
|
2166
2166
|
/**
|
|
2167
2167
|
* Builds drop primary key sql.
|
|
2168
2168
|
*/
|
|
2169
2169
|
MysqlQueryRunner.prototype.dropPrimaryKeySql = function (table) {
|
|
2170
|
-
return new Query("ALTER TABLE "
|
|
2170
|
+
return new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY"));
|
|
2171
2171
|
};
|
|
2172
2172
|
/**
|
|
2173
2173
|
* Builds create foreign key sql.
|
|
2174
2174
|
*/
|
|
2175
2175
|
MysqlQueryRunner.prototype.createForeignKeySql = function (table, foreignKey) {
|
|
2176
|
-
var columnNames = foreignKey.columnNames.map(function (column) { return "`"
|
|
2177
|
-
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`"
|
|
2178
|
-
var sql = "ALTER TABLE "
|
|
2179
|
-
|
|
2176
|
+
var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
2177
|
+
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
|
|
2178
|
+
var sql = "ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
2179
|
+
"REFERENCES ".concat(this.escapePath(this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
2180
2180
|
if (foreignKey.onDelete)
|
|
2181
|
-
sql += " ON DELETE "
|
|
2181
|
+
sql += " ON DELETE ".concat(foreignKey.onDelete);
|
|
2182
2182
|
if (foreignKey.onUpdate)
|
|
2183
|
-
sql += " ON UPDATE "
|
|
2183
|
+
sql += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
2184
2184
|
return new Query(sql);
|
|
2185
2185
|
};
|
|
2186
2186
|
/**
|
|
@@ -2188,7 +2188,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2188
2188
|
*/
|
|
2189
2189
|
MysqlQueryRunner.prototype.dropForeignKeySql = function (table, foreignKeyOrName) {
|
|
2190
2190
|
var foreignKeyName = foreignKeyOrName instanceof TableForeignKey ? foreignKeyOrName.name : foreignKeyOrName;
|
|
2191
|
-
return new Query("ALTER TABLE "
|
|
2191
|
+
return new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP FOREIGN KEY `").concat(foreignKeyName, "`"));
|
|
2192
2192
|
};
|
|
2193
2193
|
/**
|
|
2194
2194
|
* Escapes a given comment so it's safe to include in a query.
|
|
@@ -2201,7 +2201,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2201
2201
|
.replace(/\\/g, "\\\\") // MySQL allows escaping characters via backslashes
|
|
2202
2202
|
.replace(/'/g, "''")
|
|
2203
2203
|
.replace(/\u0000/g, ""); // Null bytes aren't allowed in comments
|
|
2204
|
-
return "'"
|
|
2204
|
+
return "'".concat(comment, "'");
|
|
2205
2205
|
};
|
|
2206
2206
|
/**
|
|
2207
2207
|
* Escapes given table or view path.
|
|
@@ -2209,9 +2209,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2209
2209
|
MysqlQueryRunner.prototype.escapePath = function (target) {
|
|
2210
2210
|
var _a = this.driver.parseTableName(target), database = _a.database, tableName = _a.tableName;
|
|
2211
2211
|
if (database && database !== this.driver.database) {
|
|
2212
|
-
return "`"
|
|
2212
|
+
return "`".concat(database, "`.`").concat(tableName, "`");
|
|
2213
2213
|
}
|
|
2214
|
-
return "`"
|
|
2214
|
+
return "`".concat(tableName, "`");
|
|
2215
2215
|
};
|
|
2216
2216
|
/**
|
|
2217
2217
|
* Builds a part of query to create/change a column.
|
|
@@ -2223,10 +2223,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2223
2223
|
c = this.connection.driver.createFullType(column);
|
|
2224
2224
|
}
|
|
2225
2225
|
else {
|
|
2226
|
-
c = "`"
|
|
2226
|
+
c = "`".concat(column.name, "` ").concat(this.connection.driver.createFullType(column));
|
|
2227
2227
|
}
|
|
2228
2228
|
if (column.asExpression)
|
|
2229
|
-
c += " AS ("
|
|
2229
|
+
c += " AS (".concat(column.asExpression, ") ").concat(column.generatedType ? column.generatedType : "VIRTUAL");
|
|
2230
2230
|
// if you specify ZEROFILL for a numeric column, MySQL automatically adds the UNSIGNED attribute to that column.
|
|
2231
2231
|
if (column.zerofill) {
|
|
2232
2232
|
c += " ZEROFILL";
|
|
@@ -2235,11 +2235,11 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2235
2235
|
c += " UNSIGNED";
|
|
2236
2236
|
}
|
|
2237
2237
|
if (column.enum)
|
|
2238
|
-
c += " ("
|
|
2238
|
+
c += " (".concat(column.enum.map(function (value) { return "'" + value.replace(/'/g, "''") + "'"; }).join(", "), ")");
|
|
2239
2239
|
if (column.charset)
|
|
2240
|
-
c += " CHARACTER SET \""
|
|
2240
|
+
c += " CHARACTER SET \"".concat(column.charset, "\"");
|
|
2241
2241
|
if (column.collation)
|
|
2242
|
-
c += " COLLATE \""
|
|
2242
|
+
c += " COLLATE \"".concat(column.collation, "\"");
|
|
2243
2243
|
var isMariaDb = this.driver.options.type === "mariadb";
|
|
2244
2244
|
if (isMariaDb && column.asExpression && ["VIRTUAL", "STORED"].includes((column.generatedType || "VIRTUAL"))) {
|
|
2245
2245
|
// do nothing - MariaDB does not support NULL/NOT NULL expressions for VIRTUAL columns and STORED columns
|
|
@@ -2255,11 +2255,11 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2255
2255
|
if (column.isGenerated && column.generationStrategy === "increment") // don't use skipPrimary here since updates can update already exist primary without auto inc.
|
|
2256
2256
|
c += " AUTO_INCREMENT";
|
|
2257
2257
|
if (column.comment && column.comment.length > 0)
|
|
2258
|
-
c += " COMMENT "
|
|
2258
|
+
c += " COMMENT ".concat(this.escapeComment(column.comment));
|
|
2259
2259
|
if (column.default !== undefined && column.default !== null)
|
|
2260
|
-
c += " DEFAULT "
|
|
2260
|
+
c += " DEFAULT ".concat(column.default);
|
|
2261
2261
|
if (column.onUpdate)
|
|
2262
|
-
c += " ON UPDATE "
|
|
2262
|
+
c += " ON UPDATE ".concat(column.onUpdate);
|
|
2263
2263
|
return c;
|
|
2264
2264
|
};
|
|
2265
2265
|
MysqlQueryRunner.prototype.getVersion = function () {
|