typeorm 0.2.45-dev.96ac8f7 → 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 +178 -171
- 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 +172 -166
- 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 +184 -177
- 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 +145 -138
- 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 +248 -242
- 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 +145 -139
- 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 +82 -76
- 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 +226 -218
- 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 +178 -171
- 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 +172 -166
- 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 +184 -177
- 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 +145 -138
- 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 +248 -242
- 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 +145 -139
- 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 +82 -76
- 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 +226 -218
- 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
|
@@ -84,7 +84,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
84
84
|
case 5:
|
|
85
85
|
_a.sent();
|
|
86
86
|
return [3 /*break*/, 8];
|
|
87
|
-
case 6: return [4 /*yield*/, this.query("SAVEPOINT typeorm_"
|
|
87
|
+
case 6: return [4 /*yield*/, this.query("SAVEPOINT typeorm_".concat(this.transactionDepth))];
|
|
88
88
|
case 7:
|
|
89
89
|
_a.sent();
|
|
90
90
|
_a.label = 8;
|
|
@@ -113,7 +113,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
113
113
|
case 1:
|
|
114
114
|
_a.sent();
|
|
115
115
|
if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
|
|
116
|
-
return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_"
|
|
116
|
+
return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
|
|
117
117
|
case 2:
|
|
118
118
|
_a.sent();
|
|
119
119
|
return [3 /*break*/, 5];
|
|
@@ -147,7 +147,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
147
147
|
case 1:
|
|
148
148
|
_a.sent();
|
|
149
149
|
if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
|
|
150
|
-
return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_"
|
|
150
|
+
return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
|
|
151
151
|
case 2:
|
|
152
152
|
_a.sent();
|
|
153
153
|
return [3 /*break*/, 5];
|
|
@@ -258,7 +258,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
258
258
|
var result;
|
|
259
259
|
return (0, tslib_1.__generator)(this, function (_a) {
|
|
260
260
|
switch (_a.label) {
|
|
261
|
-
case 0: return [4 /*yield*/, this.query("SELECT * FROM `INFORMATION_SCHEMA`.`SCHEMATA` WHERE `SCHEMA_NAME` = '"
|
|
261
|
+
case 0: return [4 /*yield*/, this.query("SELECT * FROM `INFORMATION_SCHEMA`.`SCHEMATA` WHERE `SCHEMA_NAME` = '".concat(database, "'"))];
|
|
262
262
|
case 1:
|
|
263
263
|
result = _a.sent();
|
|
264
264
|
return [2 /*return*/, result.length ? true : false];
|
|
@@ -318,7 +318,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
318
318
|
switch (_a.label) {
|
|
319
319
|
case 0:
|
|
320
320
|
parsedTableName = this.driver.parseTableName(tableOrName);
|
|
321
|
-
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '"
|
|
321
|
+
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '".concat(parsedTableName.database, "' AND `TABLE_NAME` = '").concat(parsedTableName.tableName, "'");
|
|
322
322
|
return [4 /*yield*/, this.query(sql)];
|
|
323
323
|
case 1:
|
|
324
324
|
result = _a.sent();
|
|
@@ -338,7 +338,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
338
338
|
case 0:
|
|
339
339
|
parsedTableName = this.driver.parseTableName(tableOrName);
|
|
340
340
|
columnName = column instanceof TableColumn_1.TableColumn ? column.name : column;
|
|
341
|
-
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '"
|
|
341
|
+
sql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '".concat(parsedTableName.database, "' AND `TABLE_NAME` = '").concat(parsedTableName.tableName, "' AND `COLUMN_NAME` = '").concat(columnName, "'");
|
|
342
342
|
return [4 /*yield*/, this.query(sql)];
|
|
343
343
|
case 1:
|
|
344
344
|
result = _a.sent();
|
|
@@ -356,8 +356,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
356
356
|
return (0, tslib_1.__generator)(this, function (_a) {
|
|
357
357
|
switch (_a.label) {
|
|
358
358
|
case 0:
|
|
359
|
-
up = ifNotExist ? "CREATE DATABASE IF NOT EXISTS `"
|
|
360
|
-
down = "DROP DATABASE `"
|
|
359
|
+
up = ifNotExist ? "CREATE DATABASE IF NOT EXISTS `".concat(database, "`") : "CREATE DATABASE `".concat(database, "`");
|
|
360
|
+
down = "DROP DATABASE `".concat(database, "`");
|
|
361
361
|
return [4 /*yield*/, this.executeQueries(new Query_1.Query(up), new Query_1.Query(down))];
|
|
362
362
|
case 1:
|
|
363
363
|
_a.sent();
|
|
@@ -375,8 +375,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
375
375
|
return (0, tslib_1.__generator)(this, function (_a) {
|
|
376
376
|
switch (_a.label) {
|
|
377
377
|
case 0:
|
|
378
|
-
up = ifExist ? "DROP DATABASE IF EXISTS `"
|
|
379
|
-
down = "CREATE DATABASE `"
|
|
378
|
+
up = ifExist ? "DROP DATABASE IF EXISTS `".concat(database, "`") : "DROP DATABASE `".concat(database, "`");
|
|
379
|
+
down = "CREATE DATABASE `".concat(database, "`");
|
|
380
380
|
return [4 /*yield*/, this.executeQueries(new Query_1.Query(up), new Query_1.Query(down))];
|
|
381
381
|
case 1:
|
|
382
382
|
_a.sent();
|
|
@@ -567,14 +567,14 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
567
567
|
oldTable = _a;
|
|
568
568
|
newTable = oldTable.clone();
|
|
569
569
|
database = this.driver.parseTableName(oldTable).database;
|
|
570
|
-
newTable.name = database ? database
|
|
570
|
+
newTable.name = database ? "".concat(database, ".").concat(newTableName) : newTableName;
|
|
571
571
|
// rename table
|
|
572
|
-
upQueries.push(new Query_1.Query("RENAME TABLE "
|
|
573
|
-
downQueries.push(new Query_1.Query("RENAME TABLE "
|
|
572
|
+
upQueries.push(new Query_1.Query("RENAME TABLE ".concat(this.escapePath(oldTable), " TO ").concat(this.escapePath(newTable))));
|
|
573
|
+
downQueries.push(new Query_1.Query("RENAME TABLE ".concat(this.escapePath(newTable), " TO ").concat(this.escapePath(oldTable))));
|
|
574
574
|
// rename index constraints
|
|
575
575
|
newTable.indices.forEach(function (index) {
|
|
576
576
|
// build new constraint name
|
|
577
|
-
var columnNames = index.columnNames.map(function (column) { return "`"
|
|
577
|
+
var columnNames = index.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
578
578
|
var newIndexName = _this.connection.namingStrategy.indexName(newTable, index.columnNames, index.where);
|
|
579
579
|
// build queries
|
|
580
580
|
var indexType = "";
|
|
@@ -584,30 +584,30 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
584
584
|
indexType += "SPATIAL ";
|
|
585
585
|
if (index.isFulltext)
|
|
586
586
|
indexType += "FULLTEXT ";
|
|
587
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
588
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
587
|
+
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, ")")));
|
|
588
|
+
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, ")")));
|
|
589
589
|
// replace constraint name
|
|
590
590
|
index.name = newIndexName;
|
|
591
591
|
});
|
|
592
592
|
// rename foreign key constraint
|
|
593
593
|
newTable.foreignKeys.forEach(function (foreignKey) {
|
|
594
594
|
// build new constraint name
|
|
595
|
-
var columnNames = foreignKey.columnNames.map(function (column) { return "`"
|
|
596
|
-
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`"
|
|
595
|
+
var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
596
|
+
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
|
|
597
597
|
var newForeignKeyName = _this.connection.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames);
|
|
598
598
|
// build queries
|
|
599
|
-
var up = "ALTER TABLE "
|
|
600
|
-
|
|
599
|
+
var up = "ALTER TABLE ".concat(_this.escapePath(newTable), " DROP FOREIGN KEY `").concat(foreignKey.name, "`, ADD CONSTRAINT `").concat(newForeignKeyName, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
600
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
601
601
|
if (foreignKey.onDelete)
|
|
602
|
-
up += " ON DELETE "
|
|
602
|
+
up += " ON DELETE ".concat(foreignKey.onDelete);
|
|
603
603
|
if (foreignKey.onUpdate)
|
|
604
|
-
up += " ON UPDATE "
|
|
605
|
-
var down = "ALTER TABLE "
|
|
606
|
-
|
|
604
|
+
up += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
605
|
+
var down = "ALTER TABLE ".concat(_this.escapePath(newTable), " DROP FOREIGN KEY `").concat(newForeignKeyName, "`, ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
606
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
607
607
|
if (foreignKey.onDelete)
|
|
608
|
-
down += " ON DELETE "
|
|
608
|
+
down += " ON DELETE ".concat(foreignKey.onDelete);
|
|
609
609
|
if (foreignKey.onUpdate)
|
|
610
|
-
down += " ON UPDATE "
|
|
610
|
+
down += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
611
611
|
upQueries.push(new Query_1.Query(up));
|
|
612
612
|
downQueries.push(new Query_1.Query(down));
|
|
613
613
|
// replace constraint name
|
|
@@ -646,8 +646,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
646
646
|
upQueries = [];
|
|
647
647
|
downQueries = [];
|
|
648
648
|
skipColumnLevelPrimary = clonedTable.primaryColumns.length > 0;
|
|
649
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
650
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
649
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(column, skipColumnLevelPrimary, false))));
|
|
650
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN `").concat(column.name, "`")));
|
|
651
651
|
// create or update primary key constraint
|
|
652
652
|
if (column.isPrimary && skipColumnLevelPrimary) {
|
|
653
653
|
generatedColumn = clonedTable.columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
|
|
@@ -655,24 +655,24 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
655
655
|
nonGeneratedColumn = generatedColumn.clone();
|
|
656
656
|
nonGeneratedColumn.isGenerated = false;
|
|
657
657
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
658
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
659
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
658
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(column.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
659
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(column, true))));
|
|
660
660
|
}
|
|
661
661
|
primaryColumns = clonedTable.primaryColumns;
|
|
662
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
663
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
664
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
662
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
663
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
664
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
665
665
|
primaryColumns.push(column);
|
|
666
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
667
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
668
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
666
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
667
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
668
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
669
669
|
// if we previously dropped AUTO_INCREMENT property, we must bring it back
|
|
670
670
|
if (generatedColumn) {
|
|
671
671
|
nonGeneratedColumn = generatedColumn.clone();
|
|
672
672
|
nonGeneratedColumn.isGenerated = false;
|
|
673
673
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
674
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
675
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
674
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(column, true))));
|
|
675
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(column.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
676
676
|
}
|
|
677
677
|
}
|
|
678
678
|
columnIndex = clonedTable.indices.find(function (index) { return index.columnNames.length === 1 && index.columnNames[0] === column.name; });
|
|
@@ -691,8 +691,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
691
691
|
name: uniqueIndex.name,
|
|
692
692
|
columnNames: uniqueIndex.columnNames
|
|
693
693
|
}));
|
|
694
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
695
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
694
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex.name, "` (`").concat(column.name, "`)")));
|
|
695
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex.name, "`")));
|
|
696
696
|
}
|
|
697
697
|
return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
|
|
698
698
|
case 4:
|
|
@@ -763,7 +763,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
763
763
|
table = _a;
|
|
764
764
|
oldColumn = oldTableColumnOrName instanceof TableColumn_1.TableColumn ? oldTableColumnOrName : table.columns.find(function (c) { return c.name === oldTableColumnOrName; });
|
|
765
765
|
if (!oldColumn)
|
|
766
|
-
throw new error_1.TypeORMError("Column \""
|
|
766
|
+
throw new error_1.TypeORMError("Column \"".concat(oldTableColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
|
|
767
767
|
newColumn = undefined;
|
|
768
768
|
if (newTableColumnOrName instanceof TableColumn_1.TableColumn) {
|
|
769
769
|
newColumn = newTableColumnOrName;
|
|
@@ -806,7 +806,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
806
806
|
? oldColumnOrName
|
|
807
807
|
: table.columns.find(function (column) { return column.name === oldColumnOrName; });
|
|
808
808
|
if (!oldColumn)
|
|
809
|
-
throw new error_1.TypeORMError("Column \""
|
|
809
|
+
throw new error_1.TypeORMError("Column \"".concat(oldColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
|
|
810
810
|
if (!((newColumn.isGenerated !== oldColumn.isGenerated && newColumn.generationStrategy !== "uuid")
|
|
811
811
|
|| oldColumn.type !== newColumn.type
|
|
812
812
|
|| oldColumn.length !== newColumn.length
|
|
@@ -823,14 +823,14 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
823
823
|
case 6:
|
|
824
824
|
if (newColumn.name !== oldColumn.name) {
|
|
825
825
|
// We don't change any column properties, just rename it.
|
|
826
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
827
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
826
|
+
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))));
|
|
827
|
+
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))));
|
|
828
828
|
// rename index constraints
|
|
829
829
|
clonedTable.findColumnIndices(oldColumn).forEach(function (index) {
|
|
830
830
|
// build new constraint name
|
|
831
831
|
index.columnNames.splice(index.columnNames.indexOf(oldColumn.name), 1);
|
|
832
832
|
index.columnNames.push(newColumn.name);
|
|
833
|
-
var columnNames = index.columnNames.map(function (column) { return "`"
|
|
833
|
+
var columnNames = index.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
834
834
|
var newIndexName = _this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
|
|
835
835
|
// build queries
|
|
836
836
|
var indexType = "";
|
|
@@ -840,8 +840,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
840
840
|
indexType += "SPATIAL ";
|
|
841
841
|
if (index.isFulltext)
|
|
842
842
|
indexType += "FULLTEXT ";
|
|
843
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
844
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
843
|
+
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, ")")));
|
|
844
|
+
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, ")")));
|
|
845
845
|
// replace constraint name
|
|
846
846
|
index.name = newIndexName;
|
|
847
847
|
});
|
|
@@ -850,22 +850,22 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
850
850
|
// build new constraint name
|
|
851
851
|
foreignKey.columnNames.splice(foreignKey.columnNames.indexOf(oldColumn.name), 1);
|
|
852
852
|
foreignKey.columnNames.push(newColumn.name);
|
|
853
|
-
var columnNames = foreignKey.columnNames.map(function (column) { return "`"
|
|
854
|
-
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`"
|
|
853
|
+
var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
854
|
+
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
|
|
855
855
|
var newForeignKeyName = _this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames);
|
|
856
856
|
// build queries
|
|
857
|
-
var up = "ALTER TABLE "
|
|
858
|
-
|
|
857
|
+
var up = "ALTER TABLE ".concat(_this.escapePath(table), " DROP FOREIGN KEY `").concat(foreignKey.name, "`, ADD CONSTRAINT `").concat(newForeignKeyName, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
858
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
859
859
|
if (foreignKey.onDelete)
|
|
860
|
-
up += " ON DELETE "
|
|
860
|
+
up += " ON DELETE ".concat(foreignKey.onDelete);
|
|
861
861
|
if (foreignKey.onUpdate)
|
|
862
|
-
up += " ON UPDATE "
|
|
863
|
-
var down = "ALTER TABLE "
|
|
864
|
-
|
|
862
|
+
up += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
863
|
+
var down = "ALTER TABLE ".concat(_this.escapePath(table), " DROP FOREIGN KEY `").concat(newForeignKeyName, "`, ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
864
|
+
"REFERENCES ".concat(_this.escapePath(_this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
865
865
|
if (foreignKey.onDelete)
|
|
866
|
-
down += " ON DELETE "
|
|
866
|
+
down += " ON DELETE ".concat(foreignKey.onDelete);
|
|
867
867
|
if (foreignKey.onUpdate)
|
|
868
|
-
down += " ON UPDATE "
|
|
868
|
+
down += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
869
869
|
upQueries.push(new Query_1.Query(up));
|
|
870
870
|
downQueries.push(new Query_1.Query(down));
|
|
871
871
|
// replace constraint name
|
|
@@ -876,8 +876,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
876
876
|
oldColumn.name = newColumn.name;
|
|
877
877
|
}
|
|
878
878
|
if (this.isColumnChanged(oldColumn, newColumn, true)) {
|
|
879
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
880
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
879
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(oldColumn.name, "` ").concat(this.buildCreateColumnSql(newColumn, true))));
|
|
880
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(newColumn.name, "` ").concat(this.buildCreateColumnSql(oldColumn, true))));
|
|
881
881
|
}
|
|
882
882
|
if (newColumn.isPrimary !== oldColumn.isPrimary) {
|
|
883
883
|
generatedColumn = clonedTable.columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
|
|
@@ -885,23 +885,23 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
885
885
|
nonGeneratedColumn = generatedColumn.clone();
|
|
886
886
|
nonGeneratedColumn.isGenerated = false;
|
|
887
887
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
888
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
889
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
888
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
889
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
890
890
|
}
|
|
891
891
|
primaryColumns = clonedTable.primaryColumns;
|
|
892
892
|
// if primary column state changed, we must always drop existed constraint.
|
|
893
893
|
if (primaryColumns.length > 0) {
|
|
894
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
895
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
896
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
894
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
895
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
896
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
897
897
|
}
|
|
898
898
|
if (newColumn.isPrimary === true) {
|
|
899
899
|
primaryColumns.push(newColumn);
|
|
900
900
|
column = clonedTable.columns.find(function (column) { return column.name === newColumn.name; });
|
|
901
901
|
column.isPrimary = true;
|
|
902
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
903
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
904
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
902
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
903
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
904
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
905
905
|
}
|
|
906
906
|
else {
|
|
907
907
|
primaryColumn = primaryColumns.find(function (c) { return c.name === newColumn.name; });
|
|
@@ -910,9 +910,9 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
910
910
|
column.isPrimary = false;
|
|
911
911
|
// if we have another primary keys, we must recreate constraint.
|
|
912
912
|
if (primaryColumns.length > 0) {
|
|
913
|
-
columnNames = primaryColumns.map(function (column) { return "`"
|
|
914
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
915
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
913
|
+
columnNames = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
914
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
915
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
916
916
|
}
|
|
917
917
|
}
|
|
918
918
|
// if we have generated column, and we dropped AUTO_INCREMENT property before, we must bring it back
|
|
@@ -920,8 +920,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
920
920
|
nonGeneratedColumn = generatedColumn.clone();
|
|
921
921
|
nonGeneratedColumn.isGenerated = false;
|
|
922
922
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
923
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
924
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
923
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
924
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
925
925
|
}
|
|
926
926
|
}
|
|
927
927
|
if (newColumn.isUnique !== oldColumn.isUnique) {
|
|
@@ -936,8 +936,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
936
936
|
name: uniqueIndex.name,
|
|
937
937
|
columnNames: uniqueIndex.columnNames
|
|
938
938
|
}));
|
|
939
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
940
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
939
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex.name, "` (`").concat(newColumn.name, "`)")));
|
|
940
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex.name, "`")));
|
|
941
941
|
}
|
|
942
942
|
else {
|
|
943
943
|
uniqueIndex_1 = clonedTable.indices.find(function (index) {
|
|
@@ -946,8 +946,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
946
946
|
clonedTable.indices.splice(clonedTable.indices.indexOf(uniqueIndex_1), 1);
|
|
947
947
|
tableUnique = clonedTable.uniques.find(function (unique) { return unique.name === uniqueIndex_1.name; });
|
|
948
948
|
clonedTable.uniques.splice(clonedTable.uniques.indexOf(tableUnique), 1);
|
|
949
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
950
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
949
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(uniqueIndex_1.name, "`")));
|
|
950
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(uniqueIndex_1.name, "` (`").concat(newColumn.name, "`)")));
|
|
951
951
|
}
|
|
952
952
|
}
|
|
953
953
|
_b.label = 7;
|
|
@@ -1019,7 +1019,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1019
1019
|
table = _a;
|
|
1020
1020
|
column = columnOrName instanceof TableColumn_1.TableColumn ? columnOrName : table.findColumnByName(columnOrName);
|
|
1021
1021
|
if (!column)
|
|
1022
|
-
throw new error_1.TypeORMError("Column \""
|
|
1022
|
+
throw new error_1.TypeORMError("Column \"".concat(columnOrName, "\" was not found in table \"").concat(table.name, "\""));
|
|
1023
1023
|
clonedTable = table.clone();
|
|
1024
1024
|
upQueries = [];
|
|
1025
1025
|
downQueries = [];
|
|
@@ -1030,27 +1030,27 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1030
1030
|
nonGeneratedColumn = generatedColumn.clone();
|
|
1031
1031
|
nonGeneratedColumn.isGenerated = false;
|
|
1032
1032
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1033
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1034
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1033
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1034
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
1035
1035
|
}
|
|
1036
|
-
columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "`"
|
|
1037
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1038
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1036
|
+
columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "`".concat(primaryColumn.name, "`"); }).join(", ");
|
|
1037
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP PRIMARY KEY")));
|
|
1038
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD PRIMARY KEY (").concat(columnNames, ")")));
|
|
1039
1039
|
tableColumn = clonedTable.findColumnByName(column.name);
|
|
1040
1040
|
tableColumn.isPrimary = false;
|
|
1041
1041
|
// if primary key have multiple columns, we must recreate it without dropped column
|
|
1042
1042
|
if (clonedTable.primaryColumns.length > 0) {
|
|
1043
|
-
columnNames_1 = clonedTable.primaryColumns.map(function (primaryColumn) { return "`"
|
|
1044
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1045
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1043
|
+
columnNames_1 = clonedTable.primaryColumns.map(function (primaryColumn) { return "`".concat(primaryColumn.name, "`"); }).join(", ");
|
|
1044
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD PRIMARY KEY (").concat(columnNames_1, ")")));
|
|
1045
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP PRIMARY KEY")));
|
|
1046
1046
|
}
|
|
1047
1047
|
// 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
|
|
1048
1048
|
if (generatedColumn && generatedColumn.name !== column.name) {
|
|
1049
1049
|
nonGeneratedColumn = generatedColumn.clone();
|
|
1050
1050
|
nonGeneratedColumn.isGenerated = false;
|
|
1051
1051
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1052
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1053
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1052
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
1053
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1054
1054
|
}
|
|
1055
1055
|
}
|
|
1056
1056
|
columnIndex = clonedTable.indices.find(function (index) { return index.columnNames.length === 1 && index.columnNames[0] === column.name; });
|
|
@@ -1068,11 +1068,11 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1068
1068
|
foundIndex = clonedTable.indices.find(function (index) { return index.name === indexName_1; });
|
|
1069
1069
|
if (foundIndex)
|
|
1070
1070
|
clonedTable.indices.splice(clonedTable.indices.indexOf(foundIndex), 1);
|
|
1071
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1072
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1071
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP INDEX `").concat(indexName_1, "`")));
|
|
1072
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD UNIQUE INDEX `").concat(indexName_1, "` (`").concat(column.name, "`)")));
|
|
1073
1073
|
}
|
|
1074
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1075
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1074
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN `").concat(column.name, "`")));
|
|
1075
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(column, true))));
|
|
1076
1076
|
return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
|
|
1077
1077
|
case 4:
|
|
1078
1078
|
_b.sent();
|
|
@@ -1183,29 +1183,29 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1183
1183
|
nonGeneratedColumn = generatedColumn.clone();
|
|
1184
1184
|
nonGeneratedColumn.isGenerated = false;
|
|
1185
1185
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1186
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1187
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1186
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(generatedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1187
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(generatedColumn, true))));
|
|
1188
1188
|
}
|
|
1189
1189
|
primaryColumns = clonedTable.primaryColumns;
|
|
1190
1190
|
if (primaryColumns.length > 0) {
|
|
1191
|
-
columnNames_2 = primaryColumns.map(function (column) { return "`"
|
|
1192
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1193
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1191
|
+
columnNames_2 = primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
1192
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
1193
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNames_2, ")")));
|
|
1194
1194
|
}
|
|
1195
1195
|
// update columns in table.
|
|
1196
1196
|
clonedTable.columns
|
|
1197
1197
|
.filter(function (column) { return columnNames.indexOf(column.name) !== -1; })
|
|
1198
1198
|
.forEach(function (column) { return column.isPrimary = true; });
|
|
1199
|
-
columnNamesString = columnNames.map(function (columnName) { return "`"
|
|
1200
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1201
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1199
|
+
columnNamesString = columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
1200
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNamesString, ")")));
|
|
1201
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY")));
|
|
1202
1202
|
newOrExistGeneratedColumn = generatedColumn ? generatedColumn : columns.find(function (column) { return column.isGenerated && column.generationStrategy === "increment"; });
|
|
1203
1203
|
if (newOrExistGeneratedColumn) {
|
|
1204
1204
|
nonGeneratedColumn = newOrExistGeneratedColumn.clone();
|
|
1205
1205
|
nonGeneratedColumn.isGenerated = false;
|
|
1206
1206
|
nonGeneratedColumn.generationStrategy = undefined;
|
|
1207
|
-
upQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1208
|
-
downQueries.push(new Query_1.Query("ALTER TABLE "
|
|
1207
|
+
upQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(nonGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(newOrExistGeneratedColumn, true))));
|
|
1208
|
+
downQueries.push(new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " CHANGE `").concat(newOrExistGeneratedColumn.name, "` ").concat(this.buildCreateColumnSql(nonGeneratedColumn, true))));
|
|
1209
1209
|
changedGeneratedColumn = clonedTable.columns.find(function (column) { return column.name === newOrExistGeneratedColumn.name; });
|
|
1210
1210
|
changedGeneratedColumn.isGenerated = true;
|
|
1211
1211
|
changedGeneratedColumn.generationStrategy = "increment";
|
|
@@ -1441,7 +1441,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1441
1441
|
table = _a;
|
|
1442
1442
|
foreignKey = foreignKeyOrName instanceof TableForeignKey_1.TableForeignKey ? foreignKeyOrName : table.foreignKeys.find(function (fk) { return fk.name === foreignKeyOrName; });
|
|
1443
1443
|
if (!foreignKey)
|
|
1444
|
-
throw new error_1.TypeORMError("Supplied foreign key was not found in table "
|
|
1444
|
+
throw new error_1.TypeORMError("Supplied foreign key was not found in table ".concat(table.name));
|
|
1445
1445
|
up = this.dropForeignKeySql(table, foreignKey);
|
|
1446
1446
|
down = this.createForeignKeySql(table, foreignKey);
|
|
1447
1447
|
return [4 /*yield*/, this.executeQueries(up, down)];
|
|
@@ -1543,7 +1543,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1543
1543
|
table = _a;
|
|
1544
1544
|
index = indexOrName instanceof TableIndex_1.TableIndex ? indexOrName : table.indices.find(function (i) { return i.name === indexOrName; });
|
|
1545
1545
|
if (!index)
|
|
1546
|
-
throw new error_1.TypeORMError("Supplied index "
|
|
1546
|
+
throw new error_1.TypeORMError("Supplied index ".concat(indexOrName, " was not found in table ").concat(table.name));
|
|
1547
1547
|
up = this.dropIndexSql(table, index);
|
|
1548
1548
|
down = this.createIndexSql(table, index);
|
|
1549
1549
|
return [4 /*yield*/, this.executeQueries(up, down)];
|
|
@@ -1582,7 +1582,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1582
1582
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
|
|
1583
1583
|
return (0, tslib_1.__generator)(this, function (_a) {
|
|
1584
1584
|
switch (_a.label) {
|
|
1585
|
-
case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE "
|
|
1585
|
+
case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE ".concat(this.escapePath(tableOrName)))];
|
|
1586
1586
|
case 1:
|
|
1587
1587
|
_a.sent();
|
|
1588
1588
|
return [2 /*return*/];
|
|
@@ -1597,7 +1597,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1597
1597
|
*/
|
|
1598
1598
|
AuroraDataApiQueryRunner.prototype.clearDatabase = function (database) {
|
|
1599
1599
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
|
|
1600
|
-
var dbName, isDatabaseExist, selectViewDropsQuery, dropViewQueries, disableForeignKeysCheckQuery, dropTablesQuery, enableForeignKeysCheckQuery, dropQueries, error_2, rollbackError_1;
|
|
1600
|
+
var dbName, isDatabaseExist, isAnotherTransactionActive, selectViewDropsQuery, dropViewQueries, disableForeignKeysCheckQuery, dropTablesQuery, enableForeignKeysCheckQuery, dropQueries, error_2, rollbackError_1;
|
|
1601
1601
|
var _this = this;
|
|
1602
1602
|
return (0, tslib_1.__generator)(this, function (_a) {
|
|
1603
1603
|
switch (_a.label) {
|
|
@@ -1611,13 +1611,16 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1611
1611
|
return [2 /*return*/, Promise.resolve()];
|
|
1612
1612
|
return [3 /*break*/, 3];
|
|
1613
1613
|
case 2: throw new error_1.TypeORMError("Can not clear database. No database is specified");
|
|
1614
|
-
case 3:
|
|
1614
|
+
case 3:
|
|
1615
|
+
isAnotherTransactionActive = this.isTransactionActive;
|
|
1616
|
+
if (!!isAnotherTransactionActive) return [3 /*break*/, 5];
|
|
1617
|
+
return [4 /*yield*/, this.startTransaction()];
|
|
1615
1618
|
case 4:
|
|
1616
1619
|
_a.sent();
|
|
1617
1620
|
_a.label = 5;
|
|
1618
1621
|
case 5:
|
|
1619
|
-
_a.trys.push([5,
|
|
1620
|
-
selectViewDropsQuery = "SELECT concat('DROP VIEW IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`VIEWS` WHERE `TABLE_SCHEMA` = '"
|
|
1622
|
+
_a.trys.push([5, 14, , 20]);
|
|
1623
|
+
selectViewDropsQuery = "SELECT concat('DROP VIEW IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`VIEWS` WHERE `TABLE_SCHEMA` = '".concat(dbName, "'");
|
|
1621
1624
|
return [4 /*yield*/, this.query(selectViewDropsQuery)];
|
|
1622
1625
|
case 6:
|
|
1623
1626
|
dropViewQueries = _a.sent();
|
|
@@ -1625,7 +1628,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1625
1628
|
case 7:
|
|
1626
1629
|
_a.sent();
|
|
1627
1630
|
disableForeignKeysCheckQuery = "SET FOREIGN_KEY_CHECKS = 0;";
|
|
1628
|
-
dropTablesQuery = "SELECT concat('DROP TABLE IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA` = '"
|
|
1631
|
+
dropTablesQuery = "SELECT concat('DROP TABLE IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA` = '".concat(dbName, "'");
|
|
1629
1632
|
enableForeignKeysCheckQuery = "SET FOREIGN_KEY_CHECKS = 1;";
|
|
1630
1633
|
return [4 /*yield*/, this.query(disableForeignKeysCheckQuery)];
|
|
1631
1634
|
case 8:
|
|
@@ -1639,24 +1642,28 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1639
1642
|
return [4 /*yield*/, this.query(enableForeignKeysCheckQuery)];
|
|
1640
1643
|
case 11:
|
|
1641
1644
|
_a.sent();
|
|
1645
|
+
if (!!isAnotherTransactionActive) return [3 /*break*/, 13];
|
|
1642
1646
|
return [4 /*yield*/, this.commitTransaction()];
|
|
1643
1647
|
case 12:
|
|
1644
1648
|
_a.sent();
|
|
1645
|
-
|
|
1646
|
-
case 13:
|
|
1647
|
-
error_2 = _a.sent();
|
|
1648
|
-
_a.label = 14;
|
|
1649
|
+
_a.label = 13;
|
|
1650
|
+
case 13: return [3 /*break*/, 20];
|
|
1649
1651
|
case 14:
|
|
1650
|
-
_a.
|
|
1651
|
-
|
|
1652
|
+
error_2 = _a.sent();
|
|
1653
|
+
_a.label = 15;
|
|
1652
1654
|
case 15:
|
|
1653
|
-
_a.
|
|
1654
|
-
return [3 /*break*/, 17];
|
|
1655
|
+
_a.trys.push([15, 18, , 19]);
|
|
1656
|
+
if (!!isAnotherTransactionActive) return [3 /*break*/, 17];
|
|
1657
|
+
return [4 /*yield*/, this.rollbackTransaction()];
|
|
1655
1658
|
case 16:
|
|
1659
|
+
_a.sent();
|
|
1660
|
+
_a.label = 17;
|
|
1661
|
+
case 17: return [3 /*break*/, 19];
|
|
1662
|
+
case 18:
|
|
1656
1663
|
rollbackError_1 = _a.sent();
|
|
1657
|
-
return [3 /*break*/,
|
|
1658
|
-
case
|
|
1659
|
-
case
|
|
1664
|
+
return [3 /*break*/, 19];
|
|
1665
|
+
case 19: throw error_2;
|
|
1666
|
+
case 20: return [2 /*return*/];
|
|
1660
1667
|
}
|
|
1661
1668
|
});
|
|
1662
1669
|
});
|
|
@@ -1687,10 +1694,10 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1687
1694
|
if (!database) {
|
|
1688
1695
|
database = currentDatabase;
|
|
1689
1696
|
}
|
|
1690
|
-
return "(`t`.`schema` = '"
|
|
1697
|
+
return "(`t`.`schema` = '".concat(database, "' AND `t`.`name` = '").concat(name, "')");
|
|
1691
1698
|
}).join(" OR ");
|
|
1692
|
-
query = "SELECT `t`.*, `v`.`check_option` FROM "
|
|
1693
|
-
|
|
1699
|
+
query = "SELECT `t`.*, `v`.`check_option` FROM ".concat(this.escapePath(this.getTypeormMetadataTableName()), " `t` ") +
|
|
1700
|
+
"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, ")") : "");
|
|
1694
1701
|
return [4 /*yield*/, this.query(query)];
|
|
1695
1702
|
case 3:
|
|
1696
1703
|
dbViews = _a.sent();
|
|
@@ -1740,7 +1747,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1740
1747
|
name = database;
|
|
1741
1748
|
database = _this.driver.database || currentDatabase;
|
|
1742
1749
|
}
|
|
1743
|
-
return "(`TABLE_SCHEMA` = '"
|
|
1750
|
+
return "(`TABLE_SCHEMA` = '".concat(database, "' AND `TABLE_NAME` = '").concat(name, "')");
|
|
1744
1751
|
}).join(" OR ");
|
|
1745
1752
|
tablesSql = "SELECT TABLE_NAME, TABLE_SCHEMA FROM `INFORMATION_SCHEMA`.`TABLES` WHERE " + tablesCondition;
|
|
1746
1753
|
_f = (_e = dbTables.push).apply;
|
|
@@ -1756,21 +1763,21 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1756
1763
|
}
|
|
1757
1764
|
columnsCondition = dbTables.map(function (_a) {
|
|
1758
1765
|
var TABLE_NAME = _a.TABLE_NAME, TABLE_SCHEMA = _a.TABLE_SCHEMA;
|
|
1759
|
-
return "(`TABLE_SCHEMA` = '"
|
|
1766
|
+
return "(`TABLE_SCHEMA` = '".concat(TABLE_SCHEMA, "' AND `TABLE_NAME` = '").concat(TABLE_NAME, "')");
|
|
1760
1767
|
}).join(" OR ");
|
|
1761
1768
|
columnsSql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE " + columnsCondition;
|
|
1762
|
-
primaryKeySql = "SELECT * FROM `INFORMATION_SCHEMA`.`KEY_COLUMN_USAGE` WHERE `CONSTRAINT_NAME` = 'PRIMARY' AND ("
|
|
1769
|
+
primaryKeySql = "SELECT * FROM `INFORMATION_SCHEMA`.`KEY_COLUMN_USAGE` WHERE `CONSTRAINT_NAME` = 'PRIMARY' AND (".concat(columnsCondition, ")");
|
|
1763
1770
|
collationsSql = "SELECT `SCHEMA_NAME`, `DEFAULT_CHARACTER_SET_NAME` as `CHARSET`, `DEFAULT_COLLATION_NAME` AS `COLLATION` FROM `INFORMATION_SCHEMA`.`SCHEMATA`";
|
|
1764
1771
|
indicesCondition = dbTables.map(function (_a) {
|
|
1765
1772
|
var TABLE_NAME = _a.TABLE_NAME, TABLE_SCHEMA = _a.TABLE_SCHEMA;
|
|
1766
|
-
return "(`s`.`TABLE_SCHEMA` = '"
|
|
1773
|
+
return "(`s`.`TABLE_SCHEMA` = '".concat(TABLE_SCHEMA, "' AND `s`.`TABLE_NAME` = '").concat(TABLE_NAME, "')");
|
|
1767
1774
|
}).join(" OR ");
|
|
1768
1775
|
indicesSql = "SELECT `s`.* FROM `INFORMATION_SCHEMA`.`STATISTICS` `s` " +
|
|
1769
1776
|
"LEFT JOIN `INFORMATION_SCHEMA`.`REFERENTIAL_CONSTRAINTS` `rc` ON `s`.`INDEX_NAME` = `rc`.`CONSTRAINT_NAME` " +
|
|
1770
|
-
|
|
1777
|
+
"WHERE (".concat(indicesCondition, ") AND `s`.`INDEX_NAME` != 'PRIMARY' AND `rc`.`CONSTRAINT_NAME` IS NULL");
|
|
1771
1778
|
foreignKeysCondition = dbTables.map(function (_a) {
|
|
1772
1779
|
var TABLE_NAME = _a.TABLE_NAME, TABLE_SCHEMA = _a.TABLE_SCHEMA;
|
|
1773
|
-
return "(`kcu`.`TABLE_SCHEMA` = '"
|
|
1780
|
+
return "(`kcu`.`TABLE_SCHEMA` = '".concat(TABLE_SCHEMA, "' AND `kcu`.`TABLE_NAME` = '").concat(TABLE_NAME, "')");
|
|
1774
1781
|
}).join(" OR ");
|
|
1775
1782
|
foreignKeysSql = "SELECT `kcu`.`TABLE_SCHEMA`, `kcu`.`TABLE_NAME`, `kcu`.`CONSTRAINT_NAME`, `kcu`.`COLUMN_NAME`, `kcu`.`REFERENCED_TABLE_SCHEMA`, " +
|
|
1776
1783
|
"`kcu`.`REFERENCED_TABLE_NAME`, `kcu`.`REFERENCED_COLUMN_NAME`, `rc`.`DELETE_RULE` `ON_DELETE`, `rc`.`UPDATE_RULE` `ON_UPDATE` " +
|
|
@@ -1831,7 +1838,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1831
1838
|
tableColumn.default = undefined;
|
|
1832
1839
|
}
|
|
1833
1840
|
else {
|
|
1834
|
-
tableColumn.default = dbColumn["COLUMN_DEFAULT"] === "CURRENT_TIMESTAMP" ? dbColumn["COLUMN_DEFAULT"] : "'"
|
|
1841
|
+
tableColumn.default = dbColumn["COLUMN_DEFAULT"] === "CURRENT_TIMESTAMP" ? dbColumn["COLUMN_DEFAULT"] : "'".concat(dbColumn["COLUMN_DEFAULT"], "'");
|
|
1835
1842
|
}
|
|
1836
1843
|
if (dbColumn["EXTRA"].indexOf("on update") !== -1) {
|
|
1837
1844
|
tableColumn.onUpdate = dbColumn["EXTRA"].substring(dbColumn["EXTRA"].indexOf("on update") + 10);
|
|
@@ -1935,7 +1942,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1935
1942
|
AuroraDataApiQueryRunner.prototype.createTableSql = function (table, createForeignKeys) {
|
|
1936
1943
|
var _this = this;
|
|
1937
1944
|
var columnDefinitions = table.columns.map(function (column) { return _this.buildCreateColumnSql(column, true); }).join(", ");
|
|
1938
|
-
var sql = "CREATE TABLE "
|
|
1945
|
+
var sql = "CREATE TABLE ".concat(this.escapePath(table), " (").concat(columnDefinitions);
|
|
1939
1946
|
// we create unique indexes instead of unique constraints, because MySql does not have unique constraints.
|
|
1940
1947
|
// if we mark column as Unique, it means that we create UNIQUE INDEX.
|
|
1941
1948
|
table.columns
|
|
@@ -1969,7 +1976,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1969
1976
|
}
|
|
1970
1977
|
if (table.indices.length > 0) {
|
|
1971
1978
|
var indicesSql = table.indices.map(function (index) {
|
|
1972
|
-
var columnNames = index.columnNames.map(function (columnName) { return "`"
|
|
1979
|
+
var columnNames = index.columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
1973
1980
|
if (!index.name)
|
|
1974
1981
|
index.name = _this.connection.namingStrategy.indexName(table, index.columnNames, index.where);
|
|
1975
1982
|
var indexType = "";
|
|
@@ -1979,44 +1986,44 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
1979
1986
|
indexType += "SPATIAL ";
|
|
1980
1987
|
if (index.isFulltext)
|
|
1981
1988
|
indexType += "FULLTEXT ";
|
|
1982
|
-
return indexType
|
|
1989
|
+
return "".concat(indexType, "INDEX `").concat(index.name, "` (").concat(columnNames, ")");
|
|
1983
1990
|
}).join(", ");
|
|
1984
|
-
sql += ", "
|
|
1991
|
+
sql += ", ".concat(indicesSql);
|
|
1985
1992
|
}
|
|
1986
1993
|
if (table.foreignKeys.length > 0 && createForeignKeys) {
|
|
1987
1994
|
var foreignKeysSql = table.foreignKeys.map(function (fk) {
|
|
1988
|
-
var columnNames = fk.columnNames.map(function (columnName) { return "`"
|
|
1995
|
+
var columnNames = fk.columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
1989
1996
|
if (!fk.name)
|
|
1990
1997
|
fk.name = _this.connection.namingStrategy.foreignKeyName(table, fk.columnNames);
|
|
1991
|
-
var referencedColumnNames = fk.referencedColumnNames.map(function (columnName) { return "`"
|
|
1992
|
-
var constraint = "CONSTRAINT `"
|
|
1998
|
+
var referencedColumnNames = fk.referencedColumnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
1999
|
+
var constraint = "CONSTRAINT `".concat(fk.name, "` FOREIGN KEY (").concat(columnNames, ") REFERENCES ").concat(_this.escapePath(_this.getTablePath(fk)), " (").concat(referencedColumnNames, ")");
|
|
1993
2000
|
if (fk.onDelete)
|
|
1994
|
-
constraint += " ON DELETE "
|
|
2001
|
+
constraint += " ON DELETE ".concat(fk.onDelete);
|
|
1995
2002
|
if (fk.onUpdate)
|
|
1996
|
-
constraint += " ON UPDATE "
|
|
2003
|
+
constraint += " ON UPDATE ".concat(fk.onUpdate);
|
|
1997
2004
|
return constraint;
|
|
1998
2005
|
}).join(", ");
|
|
1999
|
-
sql += ", "
|
|
2006
|
+
sql += ", ".concat(foreignKeysSql);
|
|
2000
2007
|
}
|
|
2001
2008
|
if (table.primaryColumns.length > 0) {
|
|
2002
|
-
var columnNames = table.primaryColumns.map(function (column) { return "`"
|
|
2003
|
-
sql += ", PRIMARY KEY ("
|
|
2009
|
+
var columnNames = table.primaryColumns.map(function (column) { return "`".concat(column.name, "`"); }).join(", ");
|
|
2010
|
+
sql += ", PRIMARY KEY (".concat(columnNames, ")");
|
|
2004
2011
|
}
|
|
2005
|
-
sql += ") ENGINE="
|
|
2012
|
+
sql += ") ENGINE=".concat(table.engine || "InnoDB");
|
|
2006
2013
|
return new Query_1.Query(sql);
|
|
2007
2014
|
};
|
|
2008
2015
|
/**
|
|
2009
2016
|
* Builds drop table sql
|
|
2010
2017
|
*/
|
|
2011
2018
|
AuroraDataApiQueryRunner.prototype.dropTableSql = function (tableOrName) {
|
|
2012
|
-
return new Query_1.Query("DROP TABLE "
|
|
2019
|
+
return new Query_1.Query("DROP TABLE ".concat(this.escapePath(tableOrName)));
|
|
2013
2020
|
};
|
|
2014
2021
|
AuroraDataApiQueryRunner.prototype.createViewSql = function (view) {
|
|
2015
2022
|
if (typeof view.expression === "string") {
|
|
2016
|
-
return new Query_1.Query("CREATE VIEW "
|
|
2023
|
+
return new Query_1.Query("CREATE VIEW ".concat(this.escapePath(view), " AS ").concat(view.expression));
|
|
2017
2024
|
}
|
|
2018
2025
|
else {
|
|
2019
|
-
return new Query_1.Query("CREATE VIEW "
|
|
2026
|
+
return new Query_1.Query("CREATE VIEW ".concat(this.escapePath(view), " AS ").concat(view.expression(this.connection).getQuery()));
|
|
2020
2027
|
}
|
|
2021
2028
|
};
|
|
2022
2029
|
AuroraDataApiQueryRunner.prototype.insertViewDefinitionSql = function (view) {
|
|
@@ -2042,7 +2049,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
2042
2049
|
* Builds drop view sql.
|
|
2043
2050
|
*/
|
|
2044
2051
|
AuroraDataApiQueryRunner.prototype.dropViewSql = function (viewOrPath) {
|
|
2045
|
-
return new Query_1.Query("DROP VIEW "
|
|
2052
|
+
return new Query_1.Query("DROP VIEW ".concat(this.escapePath(viewOrPath)));
|
|
2046
2053
|
};
|
|
2047
2054
|
/**
|
|
2048
2055
|
* Builds remove view sql.
|
|
@@ -2065,7 +2072,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
2065
2072
|
* Builds create index sql.
|
|
2066
2073
|
*/
|
|
2067
2074
|
AuroraDataApiQueryRunner.prototype.createIndexSql = function (table, index) {
|
|
2068
|
-
var columns = index.columnNames.map(function (columnName) { return "`"
|
|
2075
|
+
var columns = index.columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2069
2076
|
var indexType = "";
|
|
2070
2077
|
if (index.isUnique)
|
|
2071
2078
|
indexType += "UNIQUE ";
|
|
@@ -2073,40 +2080,40 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
2073
2080
|
indexType += "SPATIAL ";
|
|
2074
2081
|
if (index.isFulltext)
|
|
2075
2082
|
indexType += "FULLTEXT ";
|
|
2076
|
-
return new Query_1.Query("CREATE "
|
|
2083
|
+
return new Query_1.Query("CREATE ".concat(indexType, "INDEX `").concat(index.name, "` ON ").concat(this.escapePath(table), " (").concat(columns, ")"));
|
|
2077
2084
|
};
|
|
2078
2085
|
/**
|
|
2079
2086
|
* Builds drop index sql.
|
|
2080
2087
|
*/
|
|
2081
2088
|
AuroraDataApiQueryRunner.prototype.dropIndexSql = function (table, indexOrName) {
|
|
2082
2089
|
var indexName = indexOrName instanceof TableIndex_1.TableIndex ? indexOrName.name : indexOrName;
|
|
2083
|
-
return new Query_1.Query("DROP INDEX `"
|
|
2090
|
+
return new Query_1.Query("DROP INDEX `".concat(indexName, "` ON ").concat(this.escapePath(table)));
|
|
2084
2091
|
};
|
|
2085
2092
|
/**
|
|
2086
2093
|
* Builds create primary key sql.
|
|
2087
2094
|
*/
|
|
2088
2095
|
AuroraDataApiQueryRunner.prototype.createPrimaryKeySql = function (table, columnNames) {
|
|
2089
|
-
var columnNamesString = columnNames.map(function (columnName) { return "`"
|
|
2090
|
-
return new Query_1.Query("ALTER TABLE "
|
|
2096
|
+
var columnNamesString = columnNames.map(function (columnName) { return "`".concat(columnName, "`"); }).join(", ");
|
|
2097
|
+
return new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " ADD PRIMARY KEY (").concat(columnNamesString, ")"));
|
|
2091
2098
|
};
|
|
2092
2099
|
/**
|
|
2093
2100
|
* Builds drop primary key sql.
|
|
2094
2101
|
*/
|
|
2095
2102
|
AuroraDataApiQueryRunner.prototype.dropPrimaryKeySql = function (table) {
|
|
2096
|
-
return new Query_1.Query("ALTER TABLE "
|
|
2103
|
+
return new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP PRIMARY KEY"));
|
|
2097
2104
|
};
|
|
2098
2105
|
/**
|
|
2099
2106
|
* Builds create foreign key sql.
|
|
2100
2107
|
*/
|
|
2101
2108
|
AuroraDataApiQueryRunner.prototype.createForeignKeySql = function (table, foreignKey) {
|
|
2102
|
-
var columnNames = foreignKey.columnNames.map(function (column) { return "`"
|
|
2103
|
-
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`"
|
|
2104
|
-
var sql = "ALTER TABLE "
|
|
2105
|
-
|
|
2109
|
+
var columnNames = foreignKey.columnNames.map(function (column) { return "`".concat(column, "`"); }).join(", ");
|
|
2110
|
+
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "`".concat(column, "`"); }).join(",");
|
|
2111
|
+
var sql = "ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT `").concat(foreignKey.name, "` FOREIGN KEY (").concat(columnNames, ") ") +
|
|
2112
|
+
"REFERENCES ".concat(this.escapePath(this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
2106
2113
|
if (foreignKey.onDelete)
|
|
2107
|
-
sql += " ON DELETE "
|
|
2114
|
+
sql += " ON DELETE ".concat(foreignKey.onDelete);
|
|
2108
2115
|
if (foreignKey.onUpdate)
|
|
2109
|
-
sql += " ON UPDATE "
|
|
2116
|
+
sql += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
2110
2117
|
return new Query_1.Query(sql);
|
|
2111
2118
|
};
|
|
2112
2119
|
/**
|
|
@@ -2114,7 +2121,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
2114
2121
|
*/
|
|
2115
2122
|
AuroraDataApiQueryRunner.prototype.dropForeignKeySql = function (table, foreignKeyOrName) {
|
|
2116
2123
|
var foreignKeyName = foreignKeyOrName instanceof TableForeignKey_1.TableForeignKey ? foreignKeyOrName.name : foreignKeyOrName;
|
|
2117
|
-
return new Query_1.Query("ALTER TABLE "
|
|
2124
|
+
return new Query_1.Query("ALTER TABLE ".concat(this.escapePath(table), " DROP FOREIGN KEY `").concat(foreignKeyName, "`"));
|
|
2118
2125
|
};
|
|
2119
2126
|
/**
|
|
2120
2127
|
* Escapes a given comment so it's safe to include in a query.
|
|
@@ -2127,7 +2134,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
2127
2134
|
.replace(/\\/g, "\\\\") // MySQL allows escaping characters via backslashes
|
|
2128
2135
|
.replace(/'/g, "''")
|
|
2129
2136
|
.replace(/\u0000/g, ""); // Null bytes aren't allowed in comments
|
|
2130
|
-
return "'"
|
|
2137
|
+
return "'".concat(comment, "'");
|
|
2131
2138
|
};
|
|
2132
2139
|
/**
|
|
2133
2140
|
* Escapes given table or view path.
|
|
@@ -2135,9 +2142,9 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
2135
2142
|
AuroraDataApiQueryRunner.prototype.escapePath = function (target) {
|
|
2136
2143
|
var _a = this.driver.parseTableName(target), database = _a.database, tableName = _a.tableName;
|
|
2137
2144
|
if (database && database !== this.driver.database) {
|
|
2138
|
-
return "`"
|
|
2145
|
+
return "`".concat(database, "`.`").concat(tableName, "`");
|
|
2139
2146
|
}
|
|
2140
|
-
return "`"
|
|
2147
|
+
return "`".concat(tableName, "`");
|
|
2141
2148
|
};
|
|
2142
2149
|
/**
|
|
2143
2150
|
* Builds a part of query to create/change a column.
|
|
@@ -2149,10 +2156,10 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
2149
2156
|
c = this.connection.driver.createFullType(column);
|
|
2150
2157
|
}
|
|
2151
2158
|
else {
|
|
2152
|
-
c = "`"
|
|
2159
|
+
c = "`".concat(column.name, "` ").concat(this.connection.driver.createFullType(column));
|
|
2153
2160
|
}
|
|
2154
2161
|
if (column.asExpression)
|
|
2155
|
-
c += " AS ("
|
|
2162
|
+
c += " AS (".concat(column.asExpression, ") ").concat(column.generatedType ? column.generatedType : "VIRTUAL");
|
|
2156
2163
|
// if you specify ZEROFILL for a numeric column, MySQL automatically adds the UNSIGNED attribute to that column.
|
|
2157
2164
|
if (column.zerofill) {
|
|
2158
2165
|
c += " ZEROFILL";
|
|
@@ -2161,11 +2168,11 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
2161
2168
|
c += " UNSIGNED";
|
|
2162
2169
|
}
|
|
2163
2170
|
if (column.enum)
|
|
2164
|
-
c += " ("
|
|
2171
|
+
c += " (".concat(column.enum.map(function (value) { return "'" + value + "'"; }).join(", "), ")");
|
|
2165
2172
|
if (column.charset)
|
|
2166
|
-
c += " CHARACTER SET \""
|
|
2173
|
+
c += " CHARACTER SET \"".concat(column.charset, "\"");
|
|
2167
2174
|
if (column.collation)
|
|
2168
|
-
c += " COLLATE \""
|
|
2175
|
+
c += " COLLATE \"".concat(column.collation, "\"");
|
|
2169
2176
|
if (!column.isNullable)
|
|
2170
2177
|
c += " NOT NULL";
|
|
2171
2178
|
if (column.isNullable)
|
|
@@ -2175,11 +2182,11 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
|
|
|
2175
2182
|
if (column.isGenerated && column.generationStrategy === "increment") // don't use skipPrimary here since updates can update already exist primary without auto inc.
|
|
2176
2183
|
c += " AUTO_INCREMENT";
|
|
2177
2184
|
if (column.comment)
|
|
2178
|
-
c += " COMMENT "
|
|
2185
|
+
c += " COMMENT ".concat(this.escapeComment(column.comment));
|
|
2179
2186
|
if (column.default !== undefined && column.default !== null)
|
|
2180
|
-
c += " DEFAULT "
|
|
2187
|
+
c += " DEFAULT ".concat(column.default);
|
|
2181
2188
|
if (column.onUpdate)
|
|
2182
|
-
c += " ON UPDATE "
|
|
2189
|
+
c += " ON UPDATE ".concat(column.onUpdate);
|
|
2183
2190
|
return c;
|
|
2184
2191
|
};
|
|
2185
2192
|
/**
|