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
|
@@ -104,7 +104,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
104
104
|
case 7:
|
|
105
105
|
_a.sent();
|
|
106
106
|
return [3 /*break*/, 10];
|
|
107
|
-
case 8: return [4 /*yield*/, this.query("SAVEPOINT typeorm_"
|
|
107
|
+
case 8: return [4 /*yield*/, this.query("SAVEPOINT typeorm_".concat(this.transactionDepth))];
|
|
108
108
|
case 9:
|
|
109
109
|
_a.sent();
|
|
110
110
|
_a.label = 10;
|
|
@@ -133,7 +133,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
133
133
|
case 1:
|
|
134
134
|
_a.sent();
|
|
135
135
|
if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
|
|
136
|
-
return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_"
|
|
136
|
+
return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
|
|
137
137
|
case 2:
|
|
138
138
|
_a.sent();
|
|
139
139
|
return [3 /*break*/, 5];
|
|
@@ -167,7 +167,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
167
167
|
case 1:
|
|
168
168
|
_a.sent();
|
|
169
169
|
if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
|
|
170
|
-
return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_"
|
|
170
|
+
return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
|
|
171
171
|
case 2:
|
|
172
172
|
_a.sent();
|
|
173
173
|
return [3 /*break*/, 5];
|
|
@@ -311,7 +311,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
311
311
|
var result;
|
|
312
312
|
return (0, tslib_1.__generator)(this, function (_a) {
|
|
313
313
|
switch (_a.label) {
|
|
314
|
-
case 0: return [4 /*yield*/, this.query("SELECT * FROM `INFORMATION_SCHEMA`.`SCHEMATA` WHERE `SCHEMA_NAME` = '"
|
|
314
|
+
case 0: return [4 /*yield*/, this.query("SELECT * FROM `INFORMATION_SCHEMA`.`SCHEMATA` WHERE `SCHEMA_NAME` = '".concat(database, "'"))];
|
|
315
315
|
case 1:
|
|
316
316
|
result = _a.sent();
|
|
317
317
|
return [2 /*return*/, result.length ? true : false];
|
|
@@ -371,7 +371,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
371
371
|
switch (_a.label) {
|
|
372
372
|
case 0:
|
|
373
373
|
parsedTableName = this.driver.parseTableName(tableOrName);
|
|
374
|
-
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '"
|
|
374
|
+
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '".concat(parsedTableName.database, "' AND `TABLE_NAME` = '").concat(parsedTableName.tableName, "'");
|
|
375
375
|
return [4 /*yield*/, this.query(sql)];
|
|
376
376
|
case 1:
|
|
377
377
|
result = _a.sent();
|
|
@@ -391,7 +391,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
391
391
|
case 0:
|
|
392
392
|
parsedTableName = this.driver.parseTableName(tableOrName);
|
|
393
393
|
columnName = column instanceof TableColumn_1.TableColumn ? column.name : column;
|
|
394
|
-
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '"
|
|
394
|
+
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '".concat(parsedTableName.database, "' AND `TABLE_NAME` = '").concat(parsedTableName.tableName, "' AND `COLUMN_NAME` = '").concat(columnName, "'");
|
|
395
395
|
return [4 /*yield*/, this.query(sql)];
|
|
396
396
|
case 1:
|
|
397
397
|
result = _a.sent();
|
|
@@ -409,8 +409,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
409
409
|
return (0, tslib_1.__generator)(this, function (_a) {
|
|
410
410
|
switch (_a.label) {
|
|
411
411
|
case 0:
|
|
412
|
-
up = ifNotExist ? "CREATE DATABASE IF NOT EXISTS `"
|
|
413
|
-
down = "DROP DATABASE `"
|
|
412
|
+
up = ifNotExist ? "CREATE DATABASE IF NOT EXISTS `".concat(database, "`") : "CREATE DATABASE `".concat(database, "`");
|
|
413
|
+
down = "DROP DATABASE `".concat(database, "`");
|
|
414
414
|
return [4 /*yield*/, this.executeQueries(new Query_1.Query(up), new Query_1.Query(down))];
|
|
415
415
|
case 1:
|
|
416
416
|
_a.sent();
|
|
@@ -428,8 +428,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
428
428
|
return (0, tslib_1.__generator)(this, function (_a) {
|
|
429
429
|
switch (_a.label) {
|
|
430
430
|
case 0:
|
|
431
|
-
up = ifExist ? "DROP DATABASE IF EXISTS `"
|
|
432
|
-
down = "CREATE DATABASE `"
|
|
431
|
+
up = ifExist ? "DROP DATABASE IF EXISTS `".concat(database, "`") : "DROP DATABASE `".concat(database, "`");
|
|
432
|
+
down = "CREATE DATABASE `".concat(database, "`");
|
|
433
433
|
return [4 /*yield*/, this.executeQueries(new Query_1.Query(up), new Query_1.Query(down))];
|
|
434
434
|
case 1:
|
|
435
435
|
_a.sent();
|
|
@@ -620,14 +620,14 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
620
620
|
oldTable = _a;
|
|
621
621
|
newTable = oldTable.clone();
|
|
622
622
|
database = this.driver.parseTableName(oldTable).database;
|
|
623
|
-
newTable.name = database ? database
|
|
623
|
+
newTable.name = database ? "".concat(database, ".").concat(newTableName) : newTableName;
|
|
624
624
|
// rename table
|
|
625
|
-
upQueries.push(new Query_1.Query("RENAME TABLE "
|
|
626
|
-
downQueries.push(new Query_1.Query("RENAME TABLE "
|
|
625
|
+
upQueries.push(new Query_1.Query("RENAME TABLE ".concat(this.escapePath(oldTable), " TO ").concat(this.escapePath(newTable))));
|
|
626
|
+
downQueries.push(new Query_1.Query("RENAME TABLE ".concat(this.escapePath(newTable), " TO ").concat(this.escapePath(oldTable))));
|
|
627
627
|
// rename index constraints
|
|
628
628
|
newTable.indices.forEach(function (index) {
|
|
629
629
|
// build new constraint name
|
|
630
|
-
var columnNames = index.columnNames.map(function (column) { return "`"
|
|
630
|
+
var columnNames = index.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
631
631
|
var newIndexName = _this.connection.namingStrategy.indexName(newTable, index.columnNames, index.where);
|
|
632
632
|
// build queries
|
|
633
633
|
var indexType = "";
|
|
@@ -637,31 +637,31 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
637
637
|
indexType += "SPATIAL ";
|
|
638
638
|
if (index.isFulltext)
|
|
639
639
|
indexType += "FULLTEXT ";
|
|
640
|
-
var indexParser = index.isFulltext && index.parser ? " WITH PARSER "
|
|
641
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
642
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
640
|
+
var indexParser = index.isFulltext && index.parser ? " WITH PARSER ".concat(index.parser) : "";
|
|
641
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(_this.escapePath(newTable), " DROP INDEX `").concat(index.name, "`, ADD ").concat(indexType, "INDEX `").concat(newIndexName, "` (").concat(columnNames, ")").concat(indexParser)));
|
|
642
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(_this.escapePath(newTable), " DROP INDEX `").concat(newIndexName, "`, ADD ").concat(indexType, "INDEX `").concat(index.name, "` (").concat(columnNames, ")").concat(indexParser)));
|
|
643
643
|
// replace constraint name
|
|
644
644
|
index.name = newIndexName;
|
|
645
645
|
});
|
|
646
646
|
// rename foreign key constraint
|
|
647
647
|
newTable.foreignKeys.forEach(function (foreignKey) {
|
|
648
648
|
// build new constraint name
|
|
649
|
-
var columnNames = foreignKey.columnNames.map(function (column) { return "`"
|
|
650
|
-
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`"
|
|
649
|
+
var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
650
|
+
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
|
|
651
651
|
var newForeignKeyName = _this.connection.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames, _this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
|
|
652
652
|
// build queries
|
|
653
|
-
var up = "ALTER TABLE "
|
|
654
|
-
|
|
653
|
+
var up = "ALTER TABLE ".concat(_this.escapePath(newTable), " DROP FOREIGN KEY `").concat(foreignKey.name, "`, ADD CONSTRAINT `").concat(newForeignKeyName, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
654
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
655
655
|
if (foreignKey.onDelete)
|
|
656
|
-
up += " ON DELETE "
|
|
656
|
+
up += " ON DELETE ".concat(foreignKey.onDelete);
|
|
657
657
|
if (foreignKey.onUpdate)
|
|
658
|
-
up += " ON UPDATE "
|
|
659
|
-
var down = "ALTER TABLE "
|
|
660
|
-
|
|
658
|
+
up += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
659
|
+
var down = "ALTER TABLE ".concat(_this.escapePath(newTable), " DROP FOREIGN KEY `").concat(newForeignKeyName, "`, ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
660
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
661
661
|
if (foreignKey.onDelete)
|
|
662
|
-
down += " ON DELETE "
|
|
662
|
+
down += " ON DELETE ".concat(foreignKey.onDelete);
|
|
663
663
|
if (foreignKey.onUpdate)
|
|
664
|
-
down += " ON UPDATE "
|
|
664
|
+
down += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
665
665
|
upQueries.push(new Query_1.Query(up));
|
|
666
666
|
downQueries.push(new Query_1.Query(down));
|
|
667
667
|
// replace constraint name
|
|
@@ -700,8 +700,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
700
700
|
upQueries = [];
|
|
701
701
|
downQueries = [];
|
|
702
702
|
skipColumnLevelPrimary = clonedTable.primaryColumns.length > 0;
|
|
703
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
704
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
703
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(column, skipColumnLevelPrimary, false))));
|
|
704
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN `").concat(column.name, "`")));
|
|
705
705
|
// create or update primary key constraint
|
|
706
706
|
if (column.isPrimary && skipColumnLevelPrimary) {
|
|
707
707
|
generatedColumn = clonedTable.columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
|
|
@@ -709,24 +709,24 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
709
709
|
nonGeneratedColumn = generatedColumn.clone();
|
|
710
710
|
nonGeneratedColumn.isGenerated = false;
|
|
711
711
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
712
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
713
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
712
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(column.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
713
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(column, true))));
|
|
714
714
|
}
|
|
715
715
|
primaryColumns = clonedTable.primaryColumns;
|
|
716
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
717
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
718
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
716
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
717
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
718
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
719
719
|
primaryColumns.push(column);
|
|
720
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
721
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
722
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
720
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
721
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
722
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
723
723
|
// if we previously dropped AUTO_INCREMENT property, we must bring it back
|
|
724
724
|
if (generatedColumn) {
|
|
725
725
|
nonGeneratedColumn = generatedColumn.clone();
|
|
726
726
|
nonGeneratedColumn.isGenerated = false;
|
|
727
727
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
728
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
729
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
728
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(column, true))));
|
|
729
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(column.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
730
730
|
}
|
|
731
731
|
}
|
|
732
732
|
columnIndex = clonedTable.indices.find(function (index) { return index.columnNames.length === 1 && index.columnNames[0] === column.name; });
|
|
@@ -745,8 +745,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
745
745
|
name: uniqueIndex.name,
|
|
746
746
|
columnNames: uniqueIndex.columnNames
|
|
747
747
|
}));
|
|
748
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
749
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
748
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex.name, "` (`").concat(column.name, "`)")));
|
|
749
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex.name, "`")));
|
|
750
750
|
}
|
|
751
751
|
return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
|
|
752
752
|
case 4:
|
|
@@ -817,7 +817,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
817
817
|
table = _a;
|
|
818
818
|
oldColumn = oldTableColumnOrName instanceof TableColumn_1.TableColumn ? oldTableColumnOrName : table.columns.find(function (c) { return c.name === oldTableColumnOrName; });
|
|
819
819
|
if (!oldColumn)
|
|
820
|
-
throw new error_1.TypeORMError("Column \""
|
|
820
|
+
throw new error_1.TypeORMError("Column \"".concat(oldTableColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
|
|
821
821
|
newColumn = undefined;
|
|
822
822
|
if (newTableColumnOrName instanceof TableColumn_1.TableColumn) {
|
|
823
823
|
newColumn = newTableColumnOrName;
|
|
@@ -860,7 +860,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
860
860
|
? oldColumnOrName
|
|
861
861
|
: table.columns.find(function (column) { return column.name === oldColumnOrName; });
|
|
862
862
|
if (!oldColumn)
|
|
863
|
-
throw new error_1.TypeORMError("Column \""
|
|
863
|
+
throw new error_1.TypeORMError("Column \"".concat(oldColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
|
|
864
864
|
if (!((newColumn.isGenerated !== oldColumn.isGenerated && newColumn.generationStrategy !== "uuid")
|
|
865
865
|
|| oldColumn.type !== newColumn.type
|
|
866
866
|
|| oldColumn.length !== newColumn.length
|
|
@@ -877,14 +877,14 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
877
877
|
case 6:
|
|
878
878
|
if (newColumn.name !== oldColumn.name) {
|
|
879
879
|
// We don't change any column properties, just rename it.
|
|
880
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
881
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
880
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(oldColumn.name, "` `").concat(newColumn.name, "` ").concat(this.buildCreateColumnSql(oldColumn, true, true))));
|
|
881
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(newColumn.name, "` `").concat(oldColumn.name, "` ").concat(this.buildCreateColumnSql(oldColumn, true, true))));
|
|
882
882
|
// rename index constraints
|
|
883
883
|
clonedTable.findColumnIndices(oldColumn).forEach(function (index) {
|
|
884
884
|
// build new constraint name
|
|
885
885
|
index.columnNames.splice(index.columnNames.indexOf(oldColumn.name), 1);
|
|
886
886
|
index.columnNames.push(newColumn.name);
|
|
887
|
-
var columnNames = index.columnNames.map(function (column) { return "`"
|
|
887
|
+
var columnNames = index.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
888
888
|
var newIndexName = _this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
|
|
889
889
|
// build queries
|
|
890
890
|
var indexType = "";
|
|
@@ -894,9 +894,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
894
894
|
indexType += "SPATIAL ";
|
|
895
895
|
if (index.isFulltext)
|
|
896
896
|
indexType += "FULLTEXT ";
|
|
897
|
-
var indexParser = index.isFulltext && index.parser ? " WITH PARSER "
|
|
898
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
899
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
897
|
+
var indexParser = index.isFulltext && index.parser ? " WITH PARSER ".concat(index.parser) : "";
|
|
898
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(_this.escapePath(table), " DROP INDEX `").concat(index.name, "`, ADD ").concat(indexType, "INDEX `").concat(newIndexName, "` (").concat(columnNames, ")").concat(indexParser)));
|
|
899
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(_this.escapePath(table), " DROP INDEX `").concat(newIndexName, "`, ADD ").concat(indexType, "INDEX `").concat(index.name, "` (").concat(columnNames, ")").concat(indexParser)));
|
|
900
900
|
// replace constraint name
|
|
901
901
|
index.name = newIndexName;
|
|
902
902
|
});
|
|
@@ -905,22 +905,22 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
905
905
|
// build new constraint name
|
|
906
906
|
foreignKey.columnNames.splice(foreignKey.columnNames.indexOf(oldColumn.name), 1);
|
|
907
907
|
foreignKey.columnNames.push(newColumn.name);
|
|
908
|
-
var columnNames = foreignKey.columnNames.map(function (column) { return "`"
|
|
909
|
-
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`"
|
|
908
|
+
var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
909
|
+
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
|
|
910
910
|
var newForeignKeyName = _this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, _this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
|
|
911
911
|
// build queries
|
|
912
|
-
var up = "ALTER TABLE "
|
|
913
|
-
|
|
912
|
+
var up = "ALTER TABLE ".concat(_this.escapePath(table), " DROP FOREIGN KEY `").concat(foreignKey.name, "`, ADD CONSTRAINT `").concat(newForeignKeyName, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
913
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
914
914
|
if (foreignKey.onDelete)
|
|
915
|
-
up += " ON DELETE "
|
|
915
|
+
up += " ON DELETE ".concat(foreignKey.onDelete);
|
|
916
916
|
if (foreignKey.onUpdate)
|
|
917
|
-
up += " ON UPDATE "
|
|
918
|
-
var down = "ALTER TABLE "
|
|
919
|
-
|
|
917
|
+
up += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
918
|
+
var down = "ALTER TABLE ".concat(_this.escapePath(table), " DROP FOREIGN KEY `").concat(newForeignKeyName, "`, ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
919
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
920
920
|
if (foreignKey.onDelete)
|
|
921
|
-
down += " ON DELETE "
|
|
921
|
+
down += " ON DELETE ".concat(foreignKey.onDelete);
|
|
922
922
|
if (foreignKey.onUpdate)
|
|
923
|
-
down += " ON UPDATE "
|
|
923
|
+
down += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
924
924
|
upQueries.push(new Query_1.Query(up));
|
|
925
925
|
downQueries.push(new Query_1.Query(down));
|
|
926
926
|
// replace constraint name
|
|
@@ -931,8 +931,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
931
931
|
oldColumn.name = newColumn.name;
|
|
932
932
|
}
|
|
933
933
|
if (this.isColumnChanged(oldColumn, newColumn, true, true)) {
|
|
934
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
935
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
934
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(oldColumn.name, "` ").concat(this.buildCreateColumnSql(newColumn, true))));
|
|
935
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(newColumn.name, "` ").concat(this.buildCreateColumnSql(oldColumn, true))));
|
|
936
936
|
}
|
|
937
937
|
if (newColumn.isPrimary !== oldColumn.isPrimary) {
|
|
938
938
|
generatedColumn = clonedTable.columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
|
|
@@ -940,23 +940,23 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
940
940
|
nonGeneratedColumn = generatedColumn.clone();
|
|
941
941
|
nonGeneratedColumn.isGenerated = false;
|
|
942
942
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
943
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
944
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
943
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
944
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
945
945
|
}
|
|
946
946
|
primaryColumns = clonedTable.primaryColumns;
|
|
947
947
|
// if primary column state changed, we must always drop existed constraint.
|
|
948
948
|
if (primaryColumns.length > 0) {
|
|
949
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
950
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
951
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
949
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
950
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
951
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
952
952
|
}
|
|
953
953
|
if (newColumn.isPrimary === true) {
|
|
954
954
|
primaryColumns.push(newColumn);
|
|
955
955
|
column = clonedTable.columns.find(function (column) { return column.name === newColumn.name; });
|
|
956
956
|
column.isPrimary = true;
|
|
957
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
958
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
959
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
957
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
958
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
959
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
960
960
|
}
|
|
961
961
|
else {
|
|
962
962
|
primaryColumn = primaryColumns.find(function (c) { return c.name === newColumn.name; });
|
|
@@ -965,9 +965,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
965
965
|
column.isPrimary = false;
|
|
966
966
|
// if we have another primary keys, we must recreate constraint.
|
|
967
967
|
if (primaryColumns.length > 0) {
|
|
968
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
969
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
970
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
968
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
969
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
970
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
971
971
|
}
|
|
972
972
|
}
|
|
973
973
|
// if we have generated column, and we dropped AUTO_INCREMENT property before, we must bring it back
|
|
@@ -975,8 +975,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
975
975
|
nonGeneratedColumn = generatedColumn.clone();
|
|
976
976
|
nonGeneratedColumn.isGenerated = false;
|
|
977
977
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
978
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
979
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
978
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
979
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
980
980
|
}
|
|
981
981
|
}
|
|
982
982
|
if (newColumn.isUnique !== oldColumn.isUnique) {
|
|
@@ -991,8 +991,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
991
991
|
name: uniqueIndex.name,
|
|
992
992
|
columnNames: uniqueIndex.columnNames
|
|
993
993
|
}));
|
|
994
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
995
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
994
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex.name, "` (`").concat(newColumn.name, "`)")));
|
|
995
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex.name, "`")));
|
|
996
996
|
}
|
|
997
997
|
else {
|
|
998
998
|
uniqueIndex_1 = clonedTable.indices.find(function (index) {
|
|
@@ -1001,8 +1001,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1001
1001
|
clonedTable.indices.splice(clonedTable.indices.indexOf(uniqueIndex_1), 1);
|
|
1002
1002
|
tableUnique = clonedTable.uniques.find(function (unique) { return unique.name === uniqueIndex_1.name; });
|
|
1003
1003
|
clonedTable.uniques.splice(clonedTable.uniques.indexOf(tableUnique), 1);
|
|
1004
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1005
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1004
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex_1.name, "`")));
|
|
1005
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex_1.name, "` (`").concat(newColumn.name, "`)")));
|
|
1006
1006
|
}
|
|
1007
1007
|
}
|
|
1008
1008
|
_b.label = 7;
|
|
@@ -1074,7 +1074,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1074
1074
|
table = _a;
|
|
1075
1075
|
column = columnOrName instanceof TableColumn_1.TableColumn ? columnOrName : table.findColumnByName(columnOrName);
|
|
1076
1076
|
if (!column)
|
|
1077
|
-
throw new error_1.TypeORMError("Column \""
|
|
1077
|
+
throw new error_1.TypeORMError("Column \"".concat(columnOrName, "\" was not found in table \"").concat(table.name, "\""));
|
|
1078
1078
|
clonedTable = table.clone();
|
|
1079
1079
|
upQueries = [];
|
|
1080
1080
|
downQueries = [];
|
|
@@ -1085,27 +1085,27 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1085
1085
|
nonGeneratedColumn = generatedColumn.clone();
|
|
1086
1086
|
nonGeneratedColumn.isGenerated = false;
|
|
1087
1087
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1088
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1089
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1088
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1089
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
1090
1090
|
}
|
|
1091
|
-
columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "`"
|
|
1092
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1093
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1091
|
+
columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "`".concat(primaryColumn.name, "`"); }).join(", ");
|
|
1092
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP PRIMARY KEY")));
|
|
1093
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
1094
1094
|
tableColumn = clonedTable.findColumnByName(column.name);
|
|
1095
1095
|
tableColumn.isPrimary = false;
|
|
1096
1096
|
// if primary key have multiple columns, we must recreate it without dropped column
|
|
1097
1097
|
if (clonedTable.primaryColumns.length > 0) {
|
|
1098
|
-
columnNames_1 = clonedTable.primaryColumns.map(function (primaryColumn) { return "`"
|
|
1099
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1100
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1098
|
+
columnNames_1 = clonedTable.primaryColumns.map(function (primaryColumn) { return "`".concat(primaryColumn.name, "`"); }).join(", ");
|
|
1099
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD PRIMARY KEY (").concat(columnNames_1, ")")));
|
|
1100
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP PRIMARY KEY")));
|
|
1101
1101
|
}
|
|
1102
1102
|
// 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
|
|
1103
1103
|
if (generatedColumn && generatedColumn.name !== column.name) {
|
|
1104
1104
|
nonGeneratedColumn = generatedColumn.clone();
|
|
1105
1105
|
nonGeneratedColumn.isGenerated = false;
|
|
1106
1106
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1107
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1108
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1107
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
1108
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1109
1109
|
}
|
|
1110
1110
|
}
|
|
1111
1111
|
columnIndex = clonedTable.indices.find(function (index) { return index.columnNames.length === 1 && index.columnNames[0] === column.name; });
|
|
@@ -1123,11 +1123,11 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1123
1123
|
foundIndex = clonedTable.indices.find(function (index) { return index.name === indexName_1; });
|
|
1124
1124
|
if (foundIndex)
|
|
1125
1125
|
clonedTable.indices.splice(clonedTable.indices.indexOf(foundIndex), 1);
|
|
1126
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1127
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1126
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(indexName_1, "`")));
|
|
1127
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(indexName_1, "` (`").concat(column.name, "`)")));
|
|
1128
1128
|
}
|
|
1129
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1130
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1129
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN `").concat(column.name, "`")));
|
|
1130
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(column, true))));
|
|
1131
1131
|
return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
|
|
1132
1132
|
case 4:
|
|
1133
1133
|
_b.sent();
|
|
@@ -1238,29 +1238,29 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1238
1238
|
nonGeneratedColumn = generatedColumn.clone();
|
|
1239
1239
|
nonGeneratedColumn.isGenerated = false;
|
|
1240
1240
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1241
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1242
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1241
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1242
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
1243
1243
|
}
|
|
1244
1244
|
primaryColumns = clonedTable.primaryColumns;
|
|
1245
1245
|
if (primaryColumns.length > 0) {
|
|
1246
|
-
columnNames_2 = primaryColumns.map(function (column) { return "`"
|
|
1247
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1248
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1246
|
+
columnNames_2 = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
1247
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
1248
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames_2, ")")));
|
|
1249
1249
|
}
|
|
1250
1250
|
// update columns in table.
|
|
1251
1251
|
clonedTable.columns
|
|
1252
1252
|
.filter(function (column) { return columnNames.indexOf(column.name) !== -1; })
|
|
1253
1253
|
.forEach(function (column) { return column.isPrimary = true; });
|
|
1254
|
-
columnNamesString = columnNames.map(function (columnName) { return "`"
|
|
1255
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1256
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1254
|
+
columnNamesString = columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
1255
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNamesString, ")")));
|
|
1256
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
1257
1257
|
newOrExistGeneratedColumn = generatedColumn ? generatedColumn : columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
|
|
1258
1258
|
if (newOrExistGeneratedColumn) {
|
|
1259
1259
|
nonGeneratedColumn = newOrExistGeneratedColumn.clone();
|
|
1260
1260
|
nonGeneratedColumn.isGenerated = false;
|
|
1261
1261
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1262
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1263
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1262
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(newOrExistGeneratedColumn, true))));
|
|
1263
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(newOrExistGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1264
1264
|
changedGeneratedColumn = clonedTable.columns.find(function (column) { return column.name === newOrExistGeneratedColumn.name; });
|
|
1265
1265
|
changedGeneratedColumn.isGenerated = true;
|
|
1266
1266
|
changedGeneratedColumn.generationStrategy = "increment";
|
|
@@ -1496,7 +1496,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1496
1496
|
table = _a;
|
|
1497
1497
|
foreignKey = foreignKeyOrName instanceof TableForeignKey_1.TableForeignKey ? foreignKeyOrName : table.foreignKeys.find(function (fk) { return fk.name === foreignKeyOrName; });
|
|
1498
1498
|
if (!foreignKey)
|
|
1499
|
-
throw new error_1.TypeORMError("Supplied foreign key was not found in table "
|
|
1499
|
+
throw new error_1.TypeORMError("Supplied foreign key was not found in table ".concat(table.name));
|
|
1500
1500
|
up = this.dropForeignKeySql(table, foreignKey);
|
|
1501
1501
|
down = this.createForeignKeySql(table, foreignKey);
|
|
1502
1502
|
return [4 /*yield*/, this.executeQueries(up, down)];
|
|
@@ -1598,7 +1598,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1598
1598
|
table = _a;
|
|
1599
1599
|
index = indexOrName instanceof TableIndex_1.TableIndex ? indexOrName : table.indices.find(function (i) { return i.name === indexOrName; });
|
|
1600
1600
|
if (!index)
|
|
1601
|
-
throw new error_1.TypeORMError("Supplied index "
|
|
1601
|
+
throw new error_1.TypeORMError("Supplied index ".concat(indexOrName, " was not found in table ").concat(table.name));
|
|
1602
1602
|
up = this.dropIndexSql(table, index);
|
|
1603
1603
|
down = this.createIndexSql(table, index);
|
|
1604
1604
|
return [4 /*yield*/, this.executeQueries(up, down)];
|
|
@@ -1637,7 +1637,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1637
1637
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
|
|
1638
1638
|
return (0, tslib_1.__generator)(this, function (_a) {
|
|
1639
1639
|
switch (_a.label) {
|
|
1640
|
-
case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE "
|
|
1640
|
+
case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE ".concat(this.escapePath(tableOrName)))];
|
|
1641
1641
|
case 1:
|
|
1642
1642
|
_a.sent();
|
|
1643
1643
|
return [2 /*return*/];
|
|
@@ -1675,7 +1675,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1675
1675
|
_a.label = 5;
|
|
1676
1676
|
case 5:
|
|
1677
1677
|
_a.trys.push([5, 14, , 20]);
|
|
1678
|
-
selectViewDropsQuery = "SELECT concat('DROP VIEW IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`VIEWS` WHERE `TABLE_SCHEMA` = '"
|
|
1678
|
+
selectViewDropsQuery = "SELECT concat('DROP VIEW IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`VIEWS` WHERE `TABLE_SCHEMA` = '".concat(dbName, "'");
|
|
1679
1679
|
return [4 /*yield*/, this.query(selectViewDropsQuery)];
|
|
1680
1680
|
case 6:
|
|
1681
1681
|
dropViewQueries = _a.sent();
|
|
@@ -1683,7 +1683,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1683
1683
|
case 7:
|
|
1684
1684
|
_a.sent();
|
|
1685
1685
|
disableForeignKeysCheckQuery = "SET FOREIGN_KEY_CHECKS = 0;";
|
|
1686
|
-
dropTablesQuery = "SELECT concat('DROP TABLE IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA` = '"
|
|
1686
|
+
dropTablesQuery = "SELECT concat('DROP TABLE IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA` = '".concat(dbName, "'");
|
|
1687
1687
|
enableForeignKeysCheckQuery = "SET FOREIGN_KEY_CHECKS = 1;";
|
|
1688
1688
|
return [4 /*yield*/, this.query(disableForeignKeysCheckQuery)];
|
|
1689
1689
|
case 8:
|
|
@@ -1749,10 +1749,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1749
1749
|
if (!database) {
|
|
1750
1750
|
database = currentDatabase;
|
|
1751
1751
|
}
|
|
1752
|
-
return "(`t`.`schema` = '"
|
|
1752
|
+
return "(`t`.`schema` = '".concat(database, "' AND `t`.`name` = '").concat(name, "')");
|
|
1753
1753
|
}).join(" OR ");
|
|
1754
|
-
query = "SELECT `t`.*, `v`.`check_option` FROM "
|
|
1755
|
-
|
|
1754
|
+
query = "SELECT `t`.*, `v`.`check_option` FROM ".concat(this.escapePath(this.getTypeormMetadataTableName()), " `t` ") +
|
|
1755
|
+
"INNER JOIN `information_schema`.`views` `v` ON `v`.`table_schema` = `t`.`schema` AND `v`.`table_name` = `t`.`name` WHERE `t`.`type` = '".concat(MetadataTableType_1.MetadataTableType.VIEW, "' ").concat(viewsCondition ? "AND (".concat(viewsCondition, ")") : "");
|
|
1756
1756
|
return [4 /*yield*/, this.query(query)];
|
|
1757
1757
|
case 3:
|
|
1758
1758
|
dbViews = _a.sent();
|
|
@@ -1802,7 +1802,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1802
1802
|
if (!database) {
|
|
1803
1803
|
database = currentDatabase;
|
|
1804
1804
|
}
|
|
1805
|
-
return "\n SELECT `TABLE_SCHEMA`,\n `TABLE_NAME`\n FROM `INFORMATION_SCHEMA`.`TABLES`\n WHERE `TABLE_SCHEMA` = '"
|
|
1805
|
+
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 ");
|
|
1806
1806
|
}).join(" UNION ");
|
|
1807
1807
|
_f = (_e = dbTables.push).apply;
|
|
1808
1808
|
_g = [dbTables];
|
|
@@ -1817,24 +1817,24 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1817
1817
|
return [2 /*return*/, []];
|
|
1818
1818
|
statsSubquerySql = dbTables.map(function (_a) {
|
|
1819
1819
|
var TABLE_SCHEMA = _a.TABLE_SCHEMA, TABLE_NAME = _a.TABLE_NAME;
|
|
1820
|
-
return "\n SELECT\n *\n FROM `INFORMATION_SCHEMA`.`STATISTICS`\n WHERE\n `TABLE_SCHEMA` = '"
|
|
1820
|
+
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 ");
|
|
1821
1821
|
}).join(" UNION ");
|
|
1822
1822
|
kcuSubquerySql = dbTables.map(function (_a) {
|
|
1823
1823
|
var TABLE_SCHEMA = _a.TABLE_SCHEMA, TABLE_NAME = _a.TABLE_NAME;
|
|
1824
|
-
return "\n SELECT\n *\n FROM `INFORMATION_SCHEMA`.`KEY_COLUMN_USAGE` `kcu`\n WHERE\n `kcu`.`TABLE_SCHEMA` = '"
|
|
1824
|
+
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 ");
|
|
1825
1825
|
}).join(" UNION ");
|
|
1826
1826
|
rcSubquerySql = dbTables.map(function (_a) {
|
|
1827
1827
|
var TABLE_SCHEMA = _a.TABLE_SCHEMA, TABLE_NAME = _a.TABLE_NAME;
|
|
1828
|
-
return "\n SELECT\n *\n FROM `INFORMATION_SCHEMA`.`REFERENTIAL_CONSTRAINTS`\n WHERE\n `CONSTRAINT_SCHEMA` = '"
|
|
1828
|
+
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 ");
|
|
1829
1829
|
}).join(" UNION ");
|
|
1830
1830
|
columnsSql = dbTables.map(function (_a) {
|
|
1831
1831
|
var TABLE_SCHEMA = _a.TABLE_SCHEMA, TABLE_NAME = _a.TABLE_NAME;
|
|
1832
|
-
return "\n SELECT\n *\n FROM\n `INFORMATION_SCHEMA`.`COLUMNS`\n WHERE\n `TABLE_SCHEMA` = '"
|
|
1832
|
+
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 ");
|
|
1833
1833
|
}).join(" UNION ");
|
|
1834
1834
|
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 ";
|
|
1835
|
-
primaryKeySql = "SELECT * FROM ("
|
|
1836
|
-
indicesSql = "\n SELECT\n `s`.*\n FROM ("
|
|
1837
|
-
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 ("
|
|
1835
|
+
primaryKeySql = "SELECT * FROM (".concat(kcuSubquerySql, ") `kcu` WHERE `CONSTRAINT_NAME` = 'PRIMARY'");
|
|
1836
|
+
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 ");
|
|
1837
|
+
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 ");
|
|
1838
1838
|
return [4 /*yield*/, Promise.all([
|
|
1839
1839
|
this.query(columnsSql),
|
|
1840
1840
|
this.query(primaryKeySql),
|
|
@@ -1906,7 +1906,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
1906
1906
|
tableColumn.default = dbColumn["COLUMN_DEFAULT"];
|
|
1907
1907
|
}
|
|
1908
1908
|
else {
|
|
1909
|
-
tableColumn.default = "'"
|
|
1909
|
+
tableColumn.default = "'".concat(dbColumn["COLUMN_DEFAULT"], "'");
|
|
1910
1910
|
}
|
|
1911
1911
|
if (dbColumn["EXTRA"].indexOf("on update") !== -1) {
|
|
1912
1912
|
// New versions of MariaDB return expressions in lowercase. We need to set it in
|
|
@@ -2006,7 +2006,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2006
2006
|
MysqlQueryRunner.prototype.createTableSql = function (table, createForeignKeys) {
|
|
2007
2007
|
var _this = this;
|
|
2008
2008
|
var columnDefinitions = table.columns.map(function (column) { return _this.buildCreateColumnSql(column, true); }).join(", ");
|
|
2009
|
-
var sql = "CREATE TABLE "
|
|
2009
|
+
var sql = "CREATE TABLE ".concat(this.escapePath(table), " (").concat(columnDefinitions);
|
|
2010
2010
|
// we create unique indexes instead of unique constraints, because MySql does not have unique constraints.
|
|
2011
2011
|
// if we mark column as Unique, it means that we create UNIQUE INDEX.
|
|
2012
2012
|
table.columns
|
|
@@ -2040,7 +2040,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2040
2040
|
}
|
|
2041
2041
|
if (table.indices.length > 0) {
|
|
2042
2042
|
var indicesSql = table.indices.map(function (index) {
|
|
2043
|
-
var columnNames = index.columnNames.map(function (columnName) { return "`"
|
|
2043
|
+
var columnNames = index.columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2044
2044
|
if (!index.name)
|
|
2045
2045
|
index.name = _this.connection.namingStrategy.indexName(table, index.columnNames, index.where);
|
|
2046
2046
|
var indexType = "";
|
|
@@ -2050,45 +2050,45 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2050
2050
|
indexType += "SPATIAL ";
|
|
2051
2051
|
if (index.isFulltext)
|
|
2052
2052
|
indexType += "FULLTEXT ";
|
|
2053
|
-
var indexParser = index.isFulltext && index.parser ? " WITH PARSER "
|
|
2054
|
-
return indexType
|
|
2053
|
+
var indexParser = index.isFulltext && index.parser ? " WITH PARSER ".concat(index.parser) : "";
|
|
2054
|
+
return "".concat(indexType, "INDEX `").concat(index.name, "` (").concat(columnNames, ")").concat(indexParser);
|
|
2055
2055
|
}).join(", ");
|
|
2056
|
-
sql += ", "
|
|
2056
|
+
sql += ", ".concat(indicesSql);
|
|
2057
2057
|
}
|
|
2058
2058
|
if (table.foreignKeys.length > 0 && createForeignKeys) {
|
|
2059
2059
|
var foreignKeysSql = table.foreignKeys.map(function (fk) {
|
|
2060
|
-
var columnNames = fk.columnNames.map(function (columnName) { return "`"
|
|
2060
|
+
var columnNames = fk.columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2061
2061
|
if (!fk.name)
|
|
2062
2062
|
fk.name = _this.connection.namingStrategy.foreignKeyName(table, fk.columnNames, _this.getTablePath(fk), fk.referencedColumnNames);
|
|
2063
|
-
var referencedColumnNames = fk.referencedColumnNames.map(function (columnName) { return "`"
|
|
2064
|
-
var constraint = "CONSTRAINT `"
|
|
2063
|
+
var referencedColumnNames = fk.referencedColumnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2064
|
+
var constraint = "CONSTRAINT `".concat(fk.name, "` FOREIGN KEY (").concat(columnNames, ") REFERENCES ").concat(_this.escapePath(_this.getTablePath(fk)), " (").concat(referencedColumnNames, ")");
|
|
2065
2065
|
if (fk.onDelete)
|
|
2066
|
-
constraint += " ON DELETE "
|
|
2066
|
+
constraint += " ON DELETE ".concat(fk.onDelete);
|
|
2067
2067
|
if (fk.onUpdate)
|
|
2068
|
-
constraint += " ON UPDATE "
|
|
2068
|
+
constraint += " ON UPDATE ".concat(fk.onUpdate);
|
|
2069
2069
|
return constraint;
|
|
2070
2070
|
}).join(", ");
|
|
2071
|
-
sql += ", "
|
|
2071
|
+
sql += ", ".concat(foreignKeysSql);
|
|
2072
2072
|
}
|
|
2073
2073
|
if (table.primaryColumns.length > 0) {
|
|
2074
|
-
var columnNames = table.primaryColumns.map(function (column) { return "`"
|
|
2075
|
-
sql += ", PRIMARY KEY ("
|
|
2074
|
+
var columnNames = table.primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
2075
|
+
sql += ", PRIMARY KEY (".concat(columnNames, ")");
|
|
2076
2076
|
}
|
|
2077
|
-
sql += ") ENGINE="
|
|
2077
|
+
sql += ") ENGINE=".concat(table.engine || "InnoDB");
|
|
2078
2078
|
return new Query_1.Query(sql);
|
|
2079
2079
|
};
|
|
2080
2080
|
/**
|
|
2081
2081
|
* Builds drop table sql
|
|
2082
2082
|
*/
|
|
2083
2083
|
MysqlQueryRunner.prototype.dropTableSql = function (tableOrName) {
|
|
2084
|
-
return new Query_1.Query("DROP TABLE "
|
|
2084
|
+
return new Query_1.Query("DROP TABLE ".concat(this.escapePath(tableOrName)));
|
|
2085
2085
|
};
|
|
2086
2086
|
MysqlQueryRunner.prototype.createViewSql = function (view) {
|
|
2087
2087
|
if (typeof view.expression === "string") {
|
|
2088
|
-
return new Query_1.Query("CREATE VIEW "
|
|
2088
|
+
return new Query_1.Query("CREATE VIEW ".concat(this.escapePath(view), " AS ").concat(view.expression));
|
|
2089
2089
|
}
|
|
2090
2090
|
else {
|
|
2091
|
-
return new Query_1.Query("CREATE VIEW "
|
|
2091
|
+
return new Query_1.Query("CREATE VIEW ".concat(this.escapePath(view), " AS ").concat(view.expression(this.connection).getQuery()));
|
|
2092
2092
|
}
|
|
2093
2093
|
};
|
|
2094
2094
|
MysqlQueryRunner.prototype.insertViewDefinitionSql = function (view) {
|
|
@@ -2114,7 +2114,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2114
2114
|
* Builds drop view sql.
|
|
2115
2115
|
*/
|
|
2116
2116
|
MysqlQueryRunner.prototype.dropViewSql = function (viewOrPath) {
|
|
2117
|
-
return new Query_1.Query("DROP VIEW "
|
|
2117
|
+
return new Query_1.Query("DROP VIEW ".concat(this.escapePath(viewOrPath)));
|
|
2118
2118
|
};
|
|
2119
2119
|
/**
|
|
2120
2120
|
* Builds remove view sql.
|
|
@@ -2141,7 +2141,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2141
2141
|
* Builds create index sql.
|
|
2142
2142
|
*/
|
|
2143
2143
|
MysqlQueryRunner.prototype.createIndexSql = function (table, index) {
|
|
2144
|
-
var columns = index.columnNames.map(function (columnName) { return "`"
|
|
2144
|
+
var columns = index.columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2145
2145
|
var indexType = "";
|
|
2146
2146
|
if (index.isUnique)
|
|
2147
2147
|
indexType += "UNIQUE ";
|
|
@@ -2149,41 +2149,41 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2149
2149
|
indexType += "SPATIAL ";
|
|
2150
2150
|
if (index.isFulltext)
|
|
2151
2151
|
indexType += "FULLTEXT ";
|
|
2152
|
-
var indexParser = index.isFulltext && index.parser ? " WITH PARSER "
|
|
2153
|
-
return new Query_1.Query("CREATE "
|
|
2152
|
+
var indexParser = index.isFulltext && index.parser ? " WITH PARSER ".concat(index.parser) : "";
|
|
2153
|
+
return new Query_1.Query("CREATE ".concat(indexType, "INDEX `").concat(index.name, "` ON ").concat(this.escapePath(table), " (").concat(columns, ")").concat(indexParser));
|
|
2154
2154
|
};
|
|
2155
2155
|
/**
|
|
2156
2156
|
* Builds drop index sql.
|
|
2157
2157
|
*/
|
|
2158
2158
|
MysqlQueryRunner.prototype.dropIndexSql = function (table, indexOrName) {
|
|
2159
2159
|
var indexName = indexOrName instanceof TableIndex_1.TableIndex ? indexOrName.name : indexOrName;
|
|
2160
|
-
return new Query_1.Query("DROP INDEX `"
|
|
2160
|
+
return new Query_1.Query("DROP INDEX `".concat(indexName, "` ON ").concat(this.escapePath(table)));
|
|
2161
2161
|
};
|
|
2162
2162
|
/**
|
|
2163
2163
|
* Builds create primary key sql.
|
|
2164
2164
|
*/
|
|
2165
2165
|
MysqlQueryRunner.prototype.createPrimaryKeySql = function (table, columnNames) {
|
|
2166
|
-
var columnNamesString = columnNames.map(function (columnName) { return "`"
|
|
2167
|
-
return new Query_1.Query("ALTER TABLE "
|
|
2166
|
+
var columnNamesString = columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2167
|
+
return new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNamesString, ")"));
|
|
2168
2168
|
};
|
|
2169
2169
|
/**
|
|
2170
2170
|
* Builds drop primary key sql.
|
|
2171
2171
|
*/
|
|
2172
2172
|
MysqlQueryRunner.prototype.dropPrimaryKeySql = function (table) {
|
|
2173
|
-
return new Query_1.Query("ALTER TABLE "
|
|
2173
|
+
return new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY"));
|
|
2174
2174
|
};
|
|
2175
2175
|
/**
|
|
2176
2176
|
* Builds create foreign key sql.
|
|
2177
2177
|
*/
|
|
2178
2178
|
MysqlQueryRunner.prototype.createForeignKeySql = function (table, foreignKey) {
|
|
2179
|
-
var columnNames = foreignKey.columnNames.map(function (column) { return "`"
|
|
2180
|
-
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`"
|
|
2181
|
-
var sql = "ALTER TABLE "
|
|
2182
|
-
|
|
2179
|
+
var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
2180
|
+
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
|
|
2181
|
+
var sql = "ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
2182
|
+
"REFERENCES ".concat(this.escapePath(this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
2183
2183
|
if (foreignKey.onDelete)
|
|
2184
|
-
sql += " ON DELETE "
|
|
2184
|
+
sql += " ON DELETE ".concat(foreignKey.onDelete);
|
|
2185
2185
|
if (foreignKey.onUpdate)
|
|
2186
|
-
sql += " ON UPDATE "
|
|
2186
|
+
sql += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
2187
2187
|
return new Query_1.Query(sql);
|
|
2188
2188
|
};
|
|
2189
2189
|
/**
|
|
@@ -2191,7 +2191,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2191
2191
|
*/
|
|
2192
2192
|
MysqlQueryRunner.prototype.dropForeignKeySql = function (table, foreignKeyOrName) {
|
|
2193
2193
|
var foreignKeyName = foreignKeyOrName instanceof TableForeignKey_1.TableForeignKey ? foreignKeyOrName.name : foreignKeyOrName;
|
|
2194
|
-
return new Query_1.Query("ALTER TABLE "
|
|
2194
|
+
return new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP FOREIGN KEY `").concat(foreignKeyName, "`"));
|
|
2195
2195
|
};
|
|
2196
2196
|
/**
|
|
2197
2197
|
* Escapes a given comment so it's safe to include in a query.
|
|
@@ -2204,7 +2204,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2204
2204
|
.replace(/\\/g, "\\\\") // MySQL allows escaping characters via backslashes
|
|
2205
2205
|
.replace(/'/g, "''")
|
|
2206
2206
|
.replace(/\u0000/g, ""); // Null bytes aren't allowed in comments
|
|
2207
|
-
return "'"
|
|
2207
|
+
return "'".concat(comment, "'");
|
|
2208
2208
|
};
|
|
2209
2209
|
/**
|
|
2210
2210
|
* Escapes given table or view path.
|
|
@@ -2212,9 +2212,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2212
2212
|
MysqlQueryRunner.prototype.escapePath = function (target) {
|
|
2213
2213
|
var _a = this.driver.parseTableName(target), database = _a.database, tableName = _a.tableName;
|
|
2214
2214
|
if (database && database !== this.driver.database) {
|
|
2215
|
-
return "`"
|
|
2215
|
+
return "`".concat(database, "`.`").concat(tableName, "`");
|
|
2216
2216
|
}
|
|
2217
|
-
return "`"
|
|
2217
|
+
return "`".concat(tableName, "`");
|
|
2218
2218
|
};
|
|
2219
2219
|
/**
|
|
2220
2220
|
* Builds a part of query to create/change a column.
|
|
@@ -2226,10 +2226,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2226
2226
|
c = this.connection.driver.createFullType(column);
|
|
2227
2227
|
}
|
|
2228
2228
|
else {
|
|
2229
|
-
c = "`"
|
|
2229
|
+
c = "`".concat(column.name, "` ").concat(this.connection.driver.createFullType(column));
|
|
2230
2230
|
}
|
|
2231
2231
|
if (column.asExpression)
|
|
2232
|
-
c += " AS ("
|
|
2232
|
+
c += " AS (".concat(column.asExpression, ") ").concat(column.generatedType ? column.generatedType : "VIRTUAL");
|
|
2233
2233
|
// if you specify ZEROFILL for a numeric column, MySQL automatically adds the UNSIGNED attribute to that column.
|
|
2234
2234
|
if (column.zerofill) {
|
|
2235
2235
|
c += " ZEROFILL";
|
|
@@ -2238,11 +2238,11 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2238
2238
|
c += " UNSIGNED";
|
|
2239
2239
|
}
|
|
2240
2240
|
if (column.enum)
|
|
2241
|
-
c += " ("
|
|
2241
|
+
c += " (".concat(column.enum.map(function (value) { return "'" + value.replace(/'/g, "''") + "'"; }).join(", "), ")");
|
|
2242
2242
|
if (column.charset)
|
|
2243
|
-
c += " CHARACTER SET \""
|
|
2243
|
+
c += " CHARACTER SET \"".concat(column.charset, "\"");
|
|
2244
2244
|
if (column.collation)
|
|
2245
|
-
c += " COLLATE \""
|
|
2245
|
+
c += " COLLATE \"".concat(column.collation, "\"");
|
|
2246
2246
|
var isMariaDb = this.driver.options.type === "mariadb";
|
|
2247
2247
|
if (isMariaDb && column.asExpression && ["VIRTUAL", "STORED"].includes((column.generatedType || "VIRTUAL"))) {
|
|
2248
2248
|
// do nothing - MariaDB does not support NULL/NOT NULL expressions for VIRTUAL columns and STORED columns
|
|
@@ -2258,11 +2258,11 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
|
|
|
2258
2258
|
if (column.isGenerated && column.generationStrategy === "increment") // don't use skipPrimary here since updates can update already exist primary without auto inc.
|
|
2259
2259
|
c += " AUTO_INCREMENT";
|
|
2260
2260
|
if (column.comment && column.comment.length > 0)
|
|
2261
|
-
c += " COMMENT "
|
|
2261
|
+
c += " COMMENT ".concat(this.escapeComment(column.comment));
|
|
2262
2262
|
if (column.default !== undefined && column.default !== null)
|
|
2263
|
-
c += " DEFAULT "
|
|
2263
|
+
c += " DEFAULT ".concat(column.default);
|
|
2264
2264
|
if (column.onUpdate)
|
|
2265
|
-
c += " ON UPDATE "
|
|
2265
|
+
c += " ON UPDATE ".concat(column.onUpdate);
|
|
2266
2266
|
return c;
|
|
2267
2267
|
};
|
|
2268
2268
|
MysqlQueryRunner.prototype.getVersion = function () {
|