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
|
@@ -140,7 +140,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
140
140
|
_a.sent();
|
|
141
141
|
_a.label = 7;
|
|
142
142
|
case 7: return [3 /*break*/, 10];
|
|
143
|
-
case 8: return [4 /*yield*/, this.query("SAVEPOINT typeorm_"
|
|
143
|
+
case 8: return [4 /*yield*/, this.query("SAVEPOINT typeorm_".concat(this.transactionDepth))];
|
|
144
144
|
case 9:
|
|
145
145
|
_a.sent();
|
|
146
146
|
_a.label = 10;
|
|
@@ -169,7 +169,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
169
169
|
case 1:
|
|
170
170
|
_a.sent();
|
|
171
171
|
if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
|
|
172
|
-
return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_"
|
|
172
|
+
return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
|
|
173
173
|
case 2:
|
|
174
174
|
_a.sent();
|
|
175
175
|
return [3 /*break*/, 5];
|
|
@@ -203,7 +203,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
203
203
|
case 1:
|
|
204
204
|
_a.sent();
|
|
205
205
|
if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
|
|
206
|
-
return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_"
|
|
206
|
+
return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_".concat(this.transactionDepth - 1))];
|
|
207
207
|
case 2:
|
|
208
208
|
_a.sent();
|
|
209
209
|
return [3 /*break*/, 5];
|
|
@@ -336,7 +336,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
336
336
|
var result;
|
|
337
337
|
return __generator(this, function (_a) {
|
|
338
338
|
switch (_a.label) {
|
|
339
|
-
case 0: return [4 /*yield*/, this.query("SELECT * FROM pg_database WHERE datname='"
|
|
339
|
+
case 0: return [4 /*yield*/, this.query("SELECT * FROM pg_database WHERE datname='".concat(database, "';"))];
|
|
340
340
|
case 1:
|
|
341
341
|
result = _a.sent();
|
|
342
342
|
return [2 /*return*/, result.length ? true : false];
|
|
@@ -368,7 +368,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
368
368
|
var result;
|
|
369
369
|
return __generator(this, function (_a) {
|
|
370
370
|
switch (_a.label) {
|
|
371
|
-
case 0: return [4 /*yield*/, this.query("SELECT * FROM \"information_schema\".\"schemata\" WHERE \"schema_name\" = '"
|
|
371
|
+
case 0: return [4 /*yield*/, this.query("SELECT * FROM \"information_schema\".\"schemata\" WHERE \"schema_name\" = '".concat(schema, "'"))];
|
|
372
372
|
case 1:
|
|
373
373
|
result = _a.sent();
|
|
374
374
|
return [2 /*return*/, result.length ? true : false];
|
|
@@ -409,7 +409,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
409
409
|
_a.schema = _b.sent();
|
|
410
410
|
_b.label = 2;
|
|
411
411
|
case 2:
|
|
412
|
-
sql = "SELECT * FROM \"information_schema\".\"tables\" WHERE \"table_schema\" = '"
|
|
412
|
+
sql = "SELECT * FROM \"information_schema\".\"tables\" WHERE \"table_schema\" = '".concat(parsedTableName.schema, "' AND \"table_name\" = '").concat(parsedTableName.tableName, "'");
|
|
413
413
|
return [4 /*yield*/, this.query(sql)];
|
|
414
414
|
case 3:
|
|
415
415
|
result = _b.sent();
|
|
@@ -435,7 +435,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
435
435
|
_a.schema = _b.sent();
|
|
436
436
|
_b.label = 2;
|
|
437
437
|
case 2:
|
|
438
|
-
sql = "SELECT * FROM \"information_schema\".\"columns\" WHERE \"table_schema\" = '"
|
|
438
|
+
sql = "SELECT * FROM \"information_schema\".\"columns\" WHERE \"table_schema\" = '".concat(parsedTableName.schema, "' AND \"table_name\" = '").concat(parsedTableName.tableName, "' AND \"column_name\" = '").concat(columnName, "'");
|
|
439
439
|
return [4 /*yield*/, this.query(sql)];
|
|
440
440
|
case 3:
|
|
441
441
|
result = _b.sent();
|
|
@@ -462,8 +462,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
462
462
|
return [2 /*return*/, Promise.resolve()];
|
|
463
463
|
_a.label = 2;
|
|
464
464
|
case 2:
|
|
465
|
-
up = "CREATE DATABASE \""
|
|
466
|
-
down = "DROP DATABASE \""
|
|
465
|
+
up = "CREATE DATABASE \"".concat(database, "\"");
|
|
466
|
+
down = "DROP DATABASE \"".concat(database, "\"");
|
|
467
467
|
return [4 /*yield*/, this.executeQueries(new Query(up), new Query(down))];
|
|
468
468
|
case 3:
|
|
469
469
|
_a.sent();
|
|
@@ -482,8 +482,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
482
482
|
return __generator(this, function (_a) {
|
|
483
483
|
switch (_a.label) {
|
|
484
484
|
case 0:
|
|
485
|
-
up = ifExist ? "DROP DATABASE IF EXISTS \""
|
|
486
|
-
down = "CREATE DATABASE \""
|
|
485
|
+
up = ifExist ? "DROP DATABASE IF EXISTS \"".concat(database, "\"") : "DROP DATABASE \"".concat(database, "\"");
|
|
486
|
+
down = "CREATE DATABASE \"".concat(database, "\"");
|
|
487
487
|
return [4 /*yield*/, this.executeQueries(new Query(up), new Query(down))];
|
|
488
488
|
case 1:
|
|
489
489
|
_a.sent();
|
|
@@ -502,8 +502,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
502
502
|
switch (_a.label) {
|
|
503
503
|
case 0:
|
|
504
504
|
schema = schemaPath.indexOf(".") === -1 ? schemaPath : schemaPath.split(".")[1];
|
|
505
|
-
up = ifNotExist ? "CREATE SCHEMA IF NOT EXISTS \""
|
|
506
|
-
down = "DROP SCHEMA \""
|
|
505
|
+
up = ifNotExist ? "CREATE SCHEMA IF NOT EXISTS \"".concat(schema, "\"") : "CREATE SCHEMA \"".concat(schema, "\"");
|
|
506
|
+
down = "DROP SCHEMA \"".concat(schema, "\" CASCADE");
|
|
507
507
|
return [4 /*yield*/, this.executeQueries(new Query(up), new Query(down))];
|
|
508
508
|
case 1:
|
|
509
509
|
_a.sent();
|
|
@@ -522,8 +522,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
522
522
|
switch (_a.label) {
|
|
523
523
|
case 0:
|
|
524
524
|
schema = schemaPath.indexOf(".") === -1 ? schemaPath : schemaPath.split(".")[1];
|
|
525
|
-
up = ifExist ? "DROP SCHEMA IF EXISTS \""
|
|
526
|
-
down = "CREATE SCHEMA \""
|
|
525
|
+
up = ifExist ? "DROP SCHEMA IF EXISTS \"".concat(schema, "\" ").concat(isCascade ? "CASCADE" : "") : "DROP SCHEMA \"".concat(schema, "\" ").concat(isCascade ? "CASCADE" : "");
|
|
526
|
+
down = "CREATE SCHEMA \"".concat(schema, "\"");
|
|
527
527
|
return [4 /*yield*/, this.executeQueries(new Query(up), new Query(down))];
|
|
528
528
|
case 1:
|
|
529
529
|
_a.sent();
|
|
@@ -794,16 +794,16 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
794
794
|
oldTable = _a;
|
|
795
795
|
newTable = oldTable.clone();
|
|
796
796
|
_b = this.driver.parseTableName(oldTable), schemaName = _b.schema, oldTableName = _b.tableName;
|
|
797
|
-
newTable.name = schemaName ? schemaName
|
|
798
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
799
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
797
|
+
newTable.name = schemaName ? "".concat(schemaName, ".").concat(newTableName) : newTableName;
|
|
798
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(oldTable), " RENAME TO \"").concat(newTableName, "\"")));
|
|
799
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(newTable), " RENAME TO \"").concat(oldTableName, "\"")));
|
|
800
800
|
// rename column primary key constraint
|
|
801
801
|
if (newTable.primaryColumns.length > 0) {
|
|
802
802
|
columnNames = newTable.primaryColumns.map(function (column) { return column.name; });
|
|
803
803
|
oldPkName = this.connection.namingStrategy.primaryKeyName(oldTable, columnNames);
|
|
804
804
|
newPkName = this.connection.namingStrategy.primaryKeyName(newTable, columnNames);
|
|
805
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
806
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
805
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(newTable), " RENAME CONSTRAINT \"").concat(oldPkName, "\" TO \"").concat(newPkName, "\"")));
|
|
806
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(newTable), " RENAME CONSTRAINT \"").concat(newPkName, "\" TO \"").concat(oldPkName, "\"")));
|
|
807
807
|
}
|
|
808
808
|
// rename sequences
|
|
809
809
|
newTable.columns.map(function (col) {
|
|
@@ -812,8 +812,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
812
812
|
var sequenceName = _this.buildSequenceName(oldTable, col.name);
|
|
813
813
|
var newSequencePath = _this.buildSequencePath(newTable, col.name);
|
|
814
814
|
var newSequenceName = _this.buildSequenceName(newTable, col.name);
|
|
815
|
-
var up = "ALTER SEQUENCE "
|
|
816
|
-
var down = "ALTER SEQUENCE "
|
|
815
|
+
var up = "ALTER SEQUENCE ".concat(_this.escapePath(sequencePath), " RENAME TO \"").concat(newSequenceName, "\"");
|
|
816
|
+
var down = "ALTER SEQUENCE ".concat(_this.escapePath(newSequencePath), " RENAME TO \"").concat(sequenceName, "\"");
|
|
817
817
|
upQueries.push(new Query(up));
|
|
818
818
|
downQueries.push(new Query(down));
|
|
819
819
|
}
|
|
@@ -823,8 +823,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
823
823
|
// build new constraint name
|
|
824
824
|
var newUniqueName = _this.connection.namingStrategy.uniqueConstraintName(newTable, unique.columnNames);
|
|
825
825
|
// build queries
|
|
826
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
827
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
826
|
+
upQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(newTable), " RENAME CONSTRAINT \"").concat(unique.name, "\" TO \"").concat(newUniqueName, "\"")));
|
|
827
|
+
downQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(newTable), " RENAME CONSTRAINT \"").concat(newUniqueName, "\" TO \"").concat(unique.name, "\"")));
|
|
828
828
|
// replace constraint name
|
|
829
829
|
unique.name = newUniqueName;
|
|
830
830
|
});
|
|
@@ -834,8 +834,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
834
834
|
var schema = _this.driver.parseTableName(newTable).schema;
|
|
835
835
|
var newIndexName = _this.connection.namingStrategy.indexName(newTable, index.columnNames, index.where);
|
|
836
836
|
// build queries
|
|
837
|
-
var up = schema ? "ALTER INDEX \""
|
|
838
|
-
var down = schema ? "ALTER INDEX \""
|
|
837
|
+
var up = schema ? "ALTER INDEX \"".concat(schema, "\".\"").concat(index.name, "\" RENAME TO \"").concat(newIndexName, "\"") : "ALTER INDEX \"".concat(index.name, "\" RENAME TO \"").concat(newIndexName, "\"");
|
|
838
|
+
var down = schema ? "ALTER INDEX \"".concat(schema, "\".\"").concat(newIndexName, "\" RENAME TO \"").concat(index.name, "\"") : "ALTER INDEX \"".concat(newIndexName, "\" RENAME TO \"").concat(index.name, "\"");
|
|
839
839
|
upQueries.push(new Query(up));
|
|
840
840
|
downQueries.push(new Query(down));
|
|
841
841
|
// replace constraint name
|
|
@@ -846,8 +846,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
846
846
|
// build new constraint name
|
|
847
847
|
var newForeignKeyName = _this.connection.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames, _this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
|
|
848
848
|
// build queries
|
|
849
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
850
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
849
|
+
upQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(newTable), " RENAME CONSTRAINT \"").concat(foreignKey.name, "\" TO \"").concat(newForeignKeyName, "\"")));
|
|
850
|
+
downQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(newTable), " RENAME CONSTRAINT \"").concat(newForeignKeyName, "\" TO \"").concat(foreignKey.name, "\"")));
|
|
851
851
|
// replace constraint name
|
|
852
852
|
foreignKey.name = newForeignKeyName;
|
|
853
853
|
});
|
|
@@ -866,8 +866,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
866
866
|
return [4 /*yield*/, this.getUserDefinedTypeName(oldTable, column)];
|
|
867
867
|
case 6:
|
|
868
868
|
oldEnumType = _d.sent();
|
|
869
|
-
upQueries.push(new Query("ALTER TYPE \""
|
|
870
|
-
downQueries.push(new Query("ALTER TYPE "
|
|
869
|
+
upQueries.push(new Query("ALTER TYPE \"".concat(oldEnumType.schema, "\".\"").concat(oldEnumType.name, "\" RENAME TO ").concat(this.buildEnumName(newTable, column, false))));
|
|
870
|
+
downQueries.push(new Query("ALTER TYPE ".concat(this.buildEnumName(newTable, column), " RENAME TO \"").concat(oldEnumType.name, "\"")));
|
|
871
871
|
_d.label = 7;
|
|
872
872
|
case 7:
|
|
873
873
|
enumColumns_2_1 = enumColumns_2.next();
|
|
@@ -922,23 +922,23 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
922
922
|
}
|
|
923
923
|
_b.label = 5;
|
|
924
924
|
case 5:
|
|
925
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
926
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
925
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(table, column))));
|
|
926
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN \"").concat(column.name, "\"")));
|
|
927
927
|
// create or update primary key constraint
|
|
928
928
|
if (column.isPrimary) {
|
|
929
929
|
primaryColumns = clonedTable.primaryColumns;
|
|
930
930
|
// if table already have primary key, me must drop it and recreate again
|
|
931
931
|
if (primaryColumns.length > 0) {
|
|
932
932
|
pkName_1 = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
|
|
933
|
-
columnNames_1 = primaryColumns.map(function (column) { return "\""
|
|
934
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
935
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
933
|
+
columnNames_1 = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
|
|
934
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName_1, "\"")));
|
|
935
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName_1, "\" PRIMARY KEY (").concat(columnNames_1, ")")));
|
|
936
936
|
}
|
|
937
937
|
primaryColumns.push(column);
|
|
938
938
|
pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
|
|
939
|
-
columnNames = primaryColumns.map(function (column) { return "\""
|
|
940
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
941
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
939
|
+
columnNames = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
|
|
940
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNames, ")")));
|
|
941
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName, "\"")));
|
|
942
942
|
}
|
|
943
943
|
columnIndex = clonedTable.indices.find(function (index) { return index.columnNames.length === 1 && index.columnNames[0] === column.name; });
|
|
944
944
|
if (columnIndex) {
|
|
@@ -952,8 +952,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
952
952
|
columnNames: [column.name]
|
|
953
953
|
});
|
|
954
954
|
clonedTable.uniques.push(uniqueConstraint);
|
|
955
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
956
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
955
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(uniqueConstraint.name, "\" UNIQUE (\"").concat(column.name, "\")")));
|
|
956
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(uniqueConstraint.name, "\"")));
|
|
957
957
|
}
|
|
958
958
|
if (!(column.generatedType === "STORED" && column.asExpression)) return [3 /*break*/, 7];
|
|
959
959
|
return [4 /*yield*/, this.getTableNameWithSchema(table.name)];
|
|
@@ -983,8 +983,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
983
983
|
case 7:
|
|
984
984
|
// create column's comment
|
|
985
985
|
if (column.comment) {
|
|
986
|
-
upQueries.push(new Query("COMMENT ON COLUMN "
|
|
987
|
-
downQueries.push(new Query("COMMENT ON COLUMN "
|
|
986
|
+
upQueries.push(new Query("COMMENT ON COLUMN ".concat(this.escapePath(table), ".\"").concat(column.name, "\" IS ").concat(this.escapeComment(column.comment))));
|
|
987
|
+
downQueries.push(new Query("COMMENT ON COLUMN ".concat(this.escapePath(table), ".\"").concat(column.name, "\" IS ").concat(this.escapeComment(column.comment))));
|
|
988
988
|
}
|
|
989
989
|
return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
|
|
990
990
|
case 8:
|
|
@@ -1055,7 +1055,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1055
1055
|
table = _a;
|
|
1056
1056
|
oldColumn = oldTableColumnOrName instanceof TableColumn ? oldTableColumnOrName : table.columns.find(function (c) { return c.name === oldTableColumnOrName; });
|
|
1057
1057
|
if (!oldColumn)
|
|
1058
|
-
throw new TypeORMError("Column \""
|
|
1058
|
+
throw new TypeORMError("Column \"".concat(oldTableColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
|
|
1059
1059
|
if (newTableColumnOrName instanceof TableColumn) {
|
|
1060
1060
|
newColumn = newTableColumnOrName;
|
|
1061
1061
|
}
|
|
@@ -1095,7 +1095,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1095
1095
|
? oldTableColumnOrName
|
|
1096
1096
|
: table.columns.find(function (column) { return column.name === oldTableColumnOrName; });
|
|
1097
1097
|
if (!oldColumn)
|
|
1098
|
-
throw new TypeORMError("Column \""
|
|
1098
|
+
throw new TypeORMError("Column \"".concat(oldTableColumnOrName, "\" was not found in the \"").concat(table.name, "\" table."));
|
|
1099
1099
|
if (!(oldColumn.type !== newColumn.type
|
|
1100
1100
|
|| oldColumn.length !== newColumn.length
|
|
1101
1101
|
|| newColumn.isArray !== oldColumn.isArray
|
|
@@ -1115,14 +1115,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1115
1115
|
case 6:
|
|
1116
1116
|
if (!(oldColumn.name !== newColumn.name)) return [3 /*break*/, 9];
|
|
1117
1117
|
// rename column
|
|
1118
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1119
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1118
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " RENAME COLUMN \"").concat(oldColumn.name, "\" TO \"").concat(newColumn.name, "\"")));
|
|
1119
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " RENAME COLUMN \"").concat(newColumn.name, "\" TO \"").concat(oldColumn.name, "\"")));
|
|
1120
1120
|
if (!(oldColumn.type === "enum" || oldColumn.type === "simple-enum")) return [3 /*break*/, 8];
|
|
1121
1121
|
return [4 /*yield*/, this.getUserDefinedTypeName(table, oldColumn)];
|
|
1122
1122
|
case 7:
|
|
1123
1123
|
oldEnumType = _b.sent();
|
|
1124
|
-
upQueries.push(new Query("ALTER TYPE \""
|
|
1125
|
-
downQueries.push(new Query("ALTER TYPE "
|
|
1124
|
+
upQueries.push(new Query("ALTER TYPE \"".concat(oldEnumType.schema, "\".\"").concat(oldEnumType.name, "\" RENAME TO ").concat(this.buildEnumName(table, newColumn, false))));
|
|
1125
|
+
downQueries.push(new Query("ALTER TYPE ".concat(this.buildEnumName(table, newColumn), " RENAME TO \"").concat(oldEnumType.name, "\"")));
|
|
1126
1126
|
_b.label = 8;
|
|
1127
1127
|
case 8:
|
|
1128
1128
|
// rename column primary key constraint
|
|
@@ -1134,8 +1134,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1134
1134
|
columnNames.splice(columnNames.indexOf(oldColumn.name), 1);
|
|
1135
1135
|
columnNames.push(newColumn.name);
|
|
1136
1136
|
newPkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
|
|
1137
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1138
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1137
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " RENAME CONSTRAINT \"").concat(oldPkName, "\" TO \"").concat(newPkName, "\"")));
|
|
1138
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " RENAME CONSTRAINT \"").concat(newPkName, "\" TO \"").concat(oldPkName, "\"")));
|
|
1139
1139
|
}
|
|
1140
1140
|
// rename column sequence
|
|
1141
1141
|
if (oldColumn.isGenerated === true && newColumn.generationStrategy === "increment") {
|
|
@@ -1143,8 +1143,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1143
1143
|
sequenceName = this.buildSequenceName(table, oldColumn.name);
|
|
1144
1144
|
newSequencePath = this.buildSequencePath(table, newColumn.name);
|
|
1145
1145
|
newSequenceName = this.buildSequenceName(table, newColumn.name);
|
|
1146
|
-
up = "ALTER SEQUENCE "
|
|
1147
|
-
down = "ALTER SEQUENCE "
|
|
1146
|
+
up = "ALTER SEQUENCE ".concat(this.escapePath(sequencePath), " RENAME TO \"").concat(newSequenceName, "\"");
|
|
1147
|
+
down = "ALTER SEQUENCE ".concat(this.escapePath(newSequencePath), " RENAME TO \"").concat(sequenceName, "\"");
|
|
1148
1148
|
upQueries.push(new Query(up));
|
|
1149
1149
|
downQueries.push(new Query(down));
|
|
1150
1150
|
}
|
|
@@ -1155,8 +1155,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1155
1155
|
unique.columnNames.push(newColumn.name);
|
|
1156
1156
|
var newUniqueName = _this.connection.namingStrategy.uniqueConstraintName(clonedTable, unique.columnNames);
|
|
1157
1157
|
// build queries
|
|
1158
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1159
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1158
|
+
upQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(table), " RENAME CONSTRAINT \"").concat(unique.name, "\" TO \"").concat(newUniqueName, "\"")));
|
|
1159
|
+
downQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(table), " RENAME CONSTRAINT \"").concat(newUniqueName, "\" TO \"").concat(unique.name, "\"")));
|
|
1160
1160
|
// replace constraint name
|
|
1161
1161
|
unique.name = newUniqueName;
|
|
1162
1162
|
});
|
|
@@ -1168,8 +1168,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1168
1168
|
var schema = _this.driver.parseTableName(table).schema;
|
|
1169
1169
|
var newIndexName = _this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
|
|
1170
1170
|
// build queries
|
|
1171
|
-
var up = schema ? "ALTER INDEX \""
|
|
1172
|
-
var down = schema ? "ALTER INDEX \""
|
|
1171
|
+
var up = schema ? "ALTER INDEX \"".concat(schema, "\".\"").concat(index.name, "\" RENAME TO \"").concat(newIndexName, "\"") : "ALTER INDEX \"".concat(index.name, "\" RENAME TO \"").concat(newIndexName, "\"");
|
|
1172
|
+
var down = schema ? "ALTER INDEX \"".concat(schema, "\".\"").concat(newIndexName, "\" RENAME TO \"").concat(index.name, "\"") : "ALTER INDEX \"".concat(newIndexName, "\" RENAME TO \"").concat(index.name, "\"");
|
|
1173
1173
|
upQueries.push(new Query(up));
|
|
1174
1174
|
downQueries.push(new Query(down));
|
|
1175
1175
|
// replace constraint name
|
|
@@ -1182,8 +1182,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1182
1182
|
foreignKey.columnNames.push(newColumn.name);
|
|
1183
1183
|
var newForeignKeyName = _this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, _this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
|
|
1184
1184
|
// build queries
|
|
1185
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1186
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1185
|
+
upQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(table), " RENAME CONSTRAINT \"").concat(foreignKey.name, "\" TO \"").concat(newForeignKeyName, "\"")));
|
|
1186
|
+
downQueries.push(new Query("ALTER TABLE ".concat(_this.escapePath(table), " RENAME CONSTRAINT \"").concat(newForeignKeyName, "\" TO \"").concat(foreignKey.name, "\"")));
|
|
1187
1187
|
// replace constraint name
|
|
1188
1188
|
foreignKey.name = newForeignKeyName;
|
|
1189
1189
|
});
|
|
@@ -1193,8 +1193,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1193
1193
|
_b.label = 9;
|
|
1194
1194
|
case 9:
|
|
1195
1195
|
if (newColumn.precision !== oldColumn.precision || newColumn.scale !== oldColumn.scale) {
|
|
1196
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1197
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1196
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" TYPE ").concat(this.driver.createFullType(newColumn))));
|
|
1197
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" TYPE ").concat(this.driver.createFullType(oldColumn))));
|
|
1198
1198
|
}
|
|
1199
1199
|
if ((newColumn.type === "enum" || newColumn.type === "simple-enum")
|
|
1200
1200
|
&& (oldColumn.type === "enum" || oldColumn.type === "simple-enum")
|
|
@@ -1206,8 +1206,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1206
1206
|
oldEnumNameWithSchema_old = this.buildEnumName(table, oldColumn, true, false, true);
|
|
1207
1207
|
oldEnumNameWithoutSchema_old = this.buildEnumName(table, oldColumn, false, false, true);
|
|
1208
1208
|
// rename old ENUM
|
|
1209
|
-
upQueries.push(new Query("ALTER TYPE "
|
|
1210
|
-
downQueries.push(new Query("ALTER TYPE "
|
|
1209
|
+
upQueries.push(new Query("ALTER TYPE ".concat(oldEnumName, " RENAME TO ").concat(oldEnumNameWithoutSchema_old)));
|
|
1210
|
+
downQueries.push(new Query("ALTER TYPE ".concat(oldEnumNameWithSchema_old, " RENAME TO ").concat(oldEnumNameWithoutSchema)));
|
|
1211
1211
|
// create new ENUM
|
|
1212
1212
|
upQueries.push(this.createEnumTypeSql(table, newColumn, newEnumName));
|
|
1213
1213
|
downQueries.push(this.dropEnumTypeSql(table, newColumn, newEnumName));
|
|
@@ -1215,18 +1215,18 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1215
1215
|
if (oldColumn.default !== null && oldColumn.default !== undefined) {
|
|
1216
1216
|
// mark default as changed to prevent double update
|
|
1217
1217
|
defaultValueChanged = true;
|
|
1218
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1219
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1218
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(oldColumn.name, "\" DROP DEFAULT")));
|
|
1219
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(oldColumn.name, "\" SET DEFAULT ").concat(oldColumn.default)));
|
|
1220
1220
|
}
|
|
1221
|
-
upType = ""
|
|
1222
|
-
downType = ""
|
|
1221
|
+
upType = "".concat(newEnumName).concat(arraySuffix, " USING \"").concat(newColumn.name, "\"::\"text\"::").concat(newEnumName).concat(arraySuffix);
|
|
1222
|
+
downType = "".concat(oldEnumNameWithSchema_old).concat(arraySuffix, " USING \"").concat(newColumn.name, "\"::\"text\"::").concat(oldEnumNameWithSchema_old).concat(arraySuffix);
|
|
1223
1223
|
// update column to use new type
|
|
1224
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1225
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1224
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" TYPE ").concat(upType)));
|
|
1225
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" TYPE ").concat(downType)));
|
|
1226
1226
|
// restore column default or create new one
|
|
1227
1227
|
if (newColumn.default !== null && newColumn.default !== undefined) {
|
|
1228
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1229
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1228
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" SET DEFAULT ").concat(newColumn.default)));
|
|
1229
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" DROP DEFAULT")));
|
|
1230
1230
|
}
|
|
1231
1231
|
// remove old ENUM
|
|
1232
1232
|
upQueries.push(this.dropEnumTypeSql(table, oldColumn, oldEnumNameWithSchema_old));
|
|
@@ -1234,35 +1234,35 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1234
1234
|
}
|
|
1235
1235
|
if (oldColumn.isNullable !== newColumn.isNullable) {
|
|
1236
1236
|
if (newColumn.isNullable) {
|
|
1237
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1238
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1237
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(oldColumn.name, "\" DROP NOT NULL")));
|
|
1238
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(oldColumn.name, "\" SET NOT NULL")));
|
|
1239
1239
|
}
|
|
1240
1240
|
else {
|
|
1241
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1242
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1241
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(oldColumn.name, "\" SET NOT NULL")));
|
|
1242
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(oldColumn.name, "\" DROP NOT NULL")));
|
|
1243
1243
|
}
|
|
1244
1244
|
}
|
|
1245
1245
|
if (oldColumn.comment !== newColumn.comment) {
|
|
1246
|
-
upQueries.push(new Query("COMMENT ON COLUMN "
|
|
1247
|
-
downQueries.push(new Query("COMMENT ON COLUMN "
|
|
1246
|
+
upQueries.push(new Query("COMMENT ON COLUMN ".concat(this.escapePath(table), ".\"").concat(oldColumn.name, "\" IS ").concat(this.escapeComment(newColumn.comment))));
|
|
1247
|
+
downQueries.push(new Query("COMMENT ON COLUMN ".concat(this.escapePath(table), ".\"").concat(newColumn.name, "\" IS ").concat(this.escapeComment(oldColumn.comment))));
|
|
1248
1248
|
}
|
|
1249
1249
|
if (newColumn.isPrimary !== oldColumn.isPrimary) {
|
|
1250
1250
|
primaryColumns = clonedTable.primaryColumns;
|
|
1251
1251
|
// if primary column state changed, we must always drop existed constraint.
|
|
1252
1252
|
if (primaryColumns.length > 0) {
|
|
1253
1253
|
pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
|
|
1254
|
-
columnNames = primaryColumns.map(function (column) { return "\""
|
|
1255
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1256
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1254
|
+
columnNames = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
|
|
1255
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName, "\"")));
|
|
1256
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNames, ")")));
|
|
1257
1257
|
}
|
|
1258
1258
|
if (newColumn.isPrimary === true) {
|
|
1259
1259
|
primaryColumns.push(newColumn);
|
|
1260
1260
|
column = clonedTable.columns.find(function (column) { return column.name === newColumn.name; });
|
|
1261
1261
|
column.isPrimary = true;
|
|
1262
1262
|
pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
|
|
1263
|
-
columnNames = primaryColumns.map(function (column) { return "\""
|
|
1264
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1265
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1263
|
+
columnNames = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
|
|
1264
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNames, ")")));
|
|
1265
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName, "\"")));
|
|
1266
1266
|
}
|
|
1267
1267
|
else {
|
|
1268
1268
|
primaryColumn = primaryColumns.find(function (c) { return c.name === newColumn.name; });
|
|
@@ -1272,9 +1272,9 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1272
1272
|
// if we have another primary keys, we must recreate constraint.
|
|
1273
1273
|
if (primaryColumns.length > 0) {
|
|
1274
1274
|
pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
|
|
1275
|
-
columnNames = primaryColumns.map(function (column) { return "\""
|
|
1276
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1277
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1275
|
+
columnNames = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
|
|
1276
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNames, ")")));
|
|
1277
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName, "\"")));
|
|
1278
1278
|
}
|
|
1279
1279
|
}
|
|
1280
1280
|
}
|
|
@@ -1285,76 +1285,76 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1285
1285
|
columnNames: [newColumn.name]
|
|
1286
1286
|
});
|
|
1287
1287
|
clonedTable.uniques.push(uniqueConstraint);
|
|
1288
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1289
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1288
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(uniqueConstraint.name, "\" UNIQUE (\"").concat(newColumn.name, "\")")));
|
|
1289
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(uniqueConstraint.name, "\"")));
|
|
1290
1290
|
}
|
|
1291
1291
|
else {
|
|
1292
1292
|
uniqueConstraint = clonedTable.uniques.find(function (unique) {
|
|
1293
1293
|
return unique.columnNames.length === 1 && !!unique.columnNames.find(function (columnName) { return columnName === newColumn.name; });
|
|
1294
1294
|
});
|
|
1295
1295
|
clonedTable.uniques.splice(clonedTable.uniques.indexOf(uniqueConstraint), 1);
|
|
1296
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1297
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1296
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(uniqueConstraint.name, "\"")));
|
|
1297
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(uniqueConstraint.name, "\" UNIQUE (\"").concat(newColumn.name, "\")")));
|
|
1298
1298
|
}
|
|
1299
1299
|
}
|
|
1300
1300
|
if (oldColumn.isGenerated !== newColumn.isGenerated) {
|
|
1301
1301
|
// if old column was "generated", we should clear defaults
|
|
1302
1302
|
if (oldColumn.isGenerated) {
|
|
1303
1303
|
if (oldColumn.generationStrategy === "uuid") {
|
|
1304
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1305
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1304
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(oldColumn.name, "\" DROP DEFAULT")));
|
|
1305
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(oldColumn.name, "\" SET DEFAULT ").concat(this.driver.uuidGenerator)));
|
|
1306
1306
|
}
|
|
1307
1307
|
else if (oldColumn.generationStrategy === "increment") {
|
|
1308
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1309
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1310
|
-
upQueries.push(new Query("DROP SEQUENCE "
|
|
1311
|
-
downQueries.push(new Query("CREATE SEQUENCE IF NOT EXISTS "
|
|
1308
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" DROP DEFAULT")));
|
|
1309
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" SET DEFAULT nextval('").concat(this.escapePath(this.buildSequencePath(table, newColumn)), "')")));
|
|
1310
|
+
upQueries.push(new Query("DROP SEQUENCE ".concat(this.escapePath(this.buildSequencePath(table, newColumn)))));
|
|
1311
|
+
downQueries.push(new Query("CREATE SEQUENCE IF NOT EXISTS ".concat(this.escapePath(this.buildSequencePath(table, newColumn)), " OWNED BY ").concat(this.escapePath(table), ".\"").concat(newColumn.name, "\"")));
|
|
1312
1312
|
}
|
|
1313
1313
|
}
|
|
1314
1314
|
if (newColumn.generationStrategy === "uuid") {
|
|
1315
1315
|
if (newColumn.isGenerated === true) {
|
|
1316
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1317
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1316
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" SET DEFAULT ").concat(this.driver.uuidGenerator)));
|
|
1317
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" DROP DEFAULT")));
|
|
1318
1318
|
}
|
|
1319
1319
|
else {
|
|
1320
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1321
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1320
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" DROP DEFAULT")));
|
|
1321
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" SET DEFAULT ").concat(this.driver.uuidGenerator)));
|
|
1322
1322
|
}
|
|
1323
1323
|
}
|
|
1324
1324
|
else if (newColumn.generationStrategy === "increment") {
|
|
1325
1325
|
if (newColumn.isGenerated === true) {
|
|
1326
|
-
upQueries.push(new Query("CREATE SEQUENCE IF NOT EXISTS "
|
|
1327
|
-
downQueries.push(new Query("DROP SEQUENCE "
|
|
1328
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1329
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1326
|
+
upQueries.push(new Query("CREATE SEQUENCE IF NOT EXISTS ".concat(this.escapePath(this.buildSequencePath(table, newColumn)), " OWNED BY ").concat(this.escapePath(table), ".\"").concat(newColumn.name, "\"")));
|
|
1327
|
+
downQueries.push(new Query("DROP SEQUENCE ".concat(this.escapePath(this.buildSequencePath(table, newColumn)))));
|
|
1328
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" SET DEFAULT nextval('").concat(this.escapePath(this.buildSequencePath(table, newColumn)), "')")));
|
|
1329
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" DROP DEFAULT")));
|
|
1330
1330
|
}
|
|
1331
1331
|
else {
|
|
1332
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1333
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1334
|
-
upQueries.push(new Query("DROP SEQUENCE "
|
|
1335
|
-
downQueries.push(new Query("CREATE SEQUENCE IF NOT EXISTS "
|
|
1332
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" DROP DEFAULT")));
|
|
1333
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" SET DEFAULT nextval('").concat(this.escapePath(this.buildSequencePath(table, newColumn)), "')")));
|
|
1334
|
+
upQueries.push(new Query("DROP SEQUENCE ".concat(this.escapePath(this.buildSequencePath(table, newColumn)))));
|
|
1335
|
+
downQueries.push(new Query("CREATE SEQUENCE IF NOT EXISTS ".concat(this.escapePath(this.buildSequencePath(table, newColumn)), " OWNED BY ").concat(this.escapePath(table), ".\"").concat(newColumn.name, "\"")));
|
|
1336
1336
|
}
|
|
1337
1337
|
}
|
|
1338
1338
|
}
|
|
1339
1339
|
// the default might have changed when the enum changed
|
|
1340
1340
|
if (newColumn.default !== oldColumn.default && !defaultValueChanged) {
|
|
1341
1341
|
if (newColumn.default !== null && newColumn.default !== undefined) {
|
|
1342
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1342
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" SET DEFAULT ").concat(newColumn.default)));
|
|
1343
1343
|
if (oldColumn.default !== null && oldColumn.default !== undefined) {
|
|
1344
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1344
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" SET DEFAULT ").concat(oldColumn.default)));
|
|
1345
1345
|
}
|
|
1346
1346
|
else {
|
|
1347
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1347
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" DROP DEFAULT")));
|
|
1348
1348
|
}
|
|
1349
1349
|
}
|
|
1350
1350
|
else if (oldColumn.default !== null && oldColumn.default !== undefined) {
|
|
1351
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1352
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1351
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" DROP DEFAULT")));
|
|
1352
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" SET DEFAULT ").concat(oldColumn.default)));
|
|
1353
1353
|
}
|
|
1354
1354
|
}
|
|
1355
1355
|
if ((newColumn.spatialFeatureType || "").toLowerCase() !== (oldColumn.spatialFeatureType || "").toLowerCase() || newColumn.srid !== oldColumn.srid) {
|
|
1356
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1357
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1356
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" TYPE ").concat(this.driver.createFullType(newColumn))));
|
|
1357
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ALTER COLUMN \"").concat(newColumn.name, "\" TYPE ").concat(this.driver.createFullType(oldColumn))));
|
|
1358
1358
|
}
|
|
1359
1359
|
if (!(newColumn.generatedType !== oldColumn.generatedType)) return [3 /*break*/, 11];
|
|
1360
1360
|
if (!(!newColumn.generatedType || newColumn.generatedType === "VIRTUAL")) return [3 /*break*/, 11];
|
|
@@ -1363,10 +1363,10 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1363
1363
|
tableNameWithSchema = (_b.sent()).split('.');
|
|
1364
1364
|
tableName = tableNameWithSchema[1];
|
|
1365
1365
|
schema = tableNameWithSchema[0];
|
|
1366
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1367
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1368
|
-
upQueries.push(new Query("UPDATE "
|
|
1369
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1366
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " RENAME COLUMN \"").concat(oldColumn.name, "\" TO \"TEMP_OLD_").concat(oldColumn.name, "\"")));
|
|
1367
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(table, newColumn))));
|
|
1368
|
+
upQueries.push(new Query("UPDATE ".concat(this.escapePath(table), " SET \"").concat(newColumn.name, "\" = \"TEMP_OLD_").concat(oldColumn.name, "\"")));
|
|
1369
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN \"TEMP_OLD_").concat(oldColumn.name, "\"")));
|
|
1370
1370
|
upQueries.push(this.deleteTypeormMetadataSql({
|
|
1371
1371
|
database: this.driver.database,
|
|
1372
1372
|
schema: schema,
|
|
@@ -1375,8 +1375,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1375
1375
|
name: oldColumn.name
|
|
1376
1376
|
}));
|
|
1377
1377
|
// However, we can't copy it back on downgrade. It needs to regenerate.
|
|
1378
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1379
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1378
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN \"").concat(newColumn.name, "\"")));
|
|
1379
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(table, oldColumn))));
|
|
1380
1380
|
downQueries.push(this.deleteTypeormMetadataSql({
|
|
1381
1381
|
database: this.driver.database,
|
|
1382
1382
|
schema: schema,
|
|
@@ -1461,24 +1461,24 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1461
1461
|
table = _a;
|
|
1462
1462
|
column = columnOrName instanceof TableColumn ? columnOrName : table.findColumnByName(columnOrName);
|
|
1463
1463
|
if (!column)
|
|
1464
|
-
throw new TypeORMError("Column \""
|
|
1464
|
+
throw new TypeORMError("Column \"".concat(columnOrName, "\" was not found in table \"").concat(table.name, "\""));
|
|
1465
1465
|
clonedTable = table.clone();
|
|
1466
1466
|
upQueries = [];
|
|
1467
1467
|
downQueries = [];
|
|
1468
1468
|
// drop primary key constraint
|
|
1469
1469
|
if (column.isPrimary) {
|
|
1470
1470
|
pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map(function (column) { return column.name; }));
|
|
1471
|
-
columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "\""
|
|
1472
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1473
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1471
|
+
columnNames = clonedTable.primaryColumns.map(function (primaryColumn) { return "\"".concat(primaryColumn.name, "\""); }).join(", ");
|
|
1472
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP CONSTRAINT \"").concat(pkName, "\"")));
|
|
1473
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNames, ")")));
|
|
1474
1474
|
tableColumn = clonedTable.findColumnByName(column.name);
|
|
1475
1475
|
tableColumn.isPrimary = false;
|
|
1476
1476
|
// if primary key have multiple columns, we must recreate it without dropped column
|
|
1477
1477
|
if (clonedTable.primaryColumns.length > 0) {
|
|
1478
1478
|
pkName_2 = this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map(function (column) { return column.name; }));
|
|
1479
|
-
columnNames_2 = clonedTable.primaryColumns.map(function (primaryColumn) { return "\""
|
|
1480
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1481
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1479
|
+
columnNames_2 = clonedTable.primaryColumns.map(function (primaryColumn) { return "\"".concat(primaryColumn.name, "\""); }).join(", ");
|
|
1480
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " ADD CONSTRAINT \"").concat(pkName_2, "\" PRIMARY KEY (").concat(columnNames_2, ")")));
|
|
1481
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(clonedTable), " DROP CONSTRAINT \"").concat(pkName_2, "\"")));
|
|
1482
1482
|
}
|
|
1483
1483
|
}
|
|
1484
1484
|
columnIndex = clonedTable.indices.find(function (index) { return index.columnNames.length === 1 && index.columnNames[0] === column.name; });
|
|
@@ -1499,8 +1499,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1499
1499
|
upQueries.push(this.dropUniqueConstraintSql(table, columnUnique));
|
|
1500
1500
|
downQueries.push(this.createUniqueConstraintSql(table, columnUnique));
|
|
1501
1501
|
}
|
|
1502
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1503
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1502
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP COLUMN \"").concat(column.name, "\"")));
|
|
1503
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD ").concat(this.buildCreateColumnSql(table, column))));
|
|
1504
1504
|
if (!(column.type === "enum" || column.type === "simple-enum")) return [3 /*break*/, 6];
|
|
1505
1505
|
return [4 /*yield*/, this.hasEnumType(table, column)];
|
|
1506
1506
|
case 4:
|
|
@@ -1509,7 +1509,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1509
1509
|
return [4 /*yield*/, this.getUserDefinedTypeName(table, column)];
|
|
1510
1510
|
case 5:
|
|
1511
1511
|
enumType = _b.sent();
|
|
1512
|
-
escapedEnumName = "\""
|
|
1512
|
+
escapedEnumName = "\"".concat(enumType.schema, "\".\"").concat(enumType.name, "\"");
|
|
1513
1513
|
upQueries.push(this.dropEnumTypeSql(table, column, escapedEnumName));
|
|
1514
1514
|
downQueries.push(this.createEnumTypeSql(table, column, escapedEnumName));
|
|
1515
1515
|
_b.label = 6;
|
|
@@ -1647,18 +1647,18 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1647
1647
|
primaryColumns = clonedTable.primaryColumns;
|
|
1648
1648
|
if (primaryColumns.length > 0) {
|
|
1649
1649
|
pkName_3 = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map(function (column) { return column.name; }));
|
|
1650
|
-
columnNamesString_1 = primaryColumns.map(function (column) { return "\""
|
|
1651
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1652
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1650
|
+
columnNamesString_1 = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
|
|
1651
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName_3, "\"")));
|
|
1652
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName_3, "\" PRIMARY KEY (").concat(columnNamesString_1, ")")));
|
|
1653
1653
|
}
|
|
1654
1654
|
// update columns in table.
|
|
1655
1655
|
clonedTable.columns
|
|
1656
1656
|
.filter(function (column) { return columnNames.indexOf(column.name) !== -1; })
|
|
1657
1657
|
.forEach(function (column) { return column.isPrimary = true; });
|
|
1658
1658
|
pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
|
|
1659
|
-
columnNamesString = columnNames.map(function (columnName) { return "\""
|
|
1660
|
-
upQueries.push(new Query("ALTER TABLE "
|
|
1661
|
-
downQueries.push(new Query("ALTER TABLE "
|
|
1659
|
+
columnNamesString = columnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
|
|
1660
|
+
upQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(pkName, "\" PRIMARY KEY (").concat(columnNamesString, ")")));
|
|
1661
|
+
downQueries.push(new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(pkName, "\"")));
|
|
1662
1662
|
return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
|
|
1663
1663
|
case 4:
|
|
1664
1664
|
_b.sent();
|
|
@@ -1790,7 +1790,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1790
1790
|
table = _a;
|
|
1791
1791
|
uniqueConstraint = uniqueOrName instanceof TableUnique ? uniqueOrName : table.uniques.find(function (u) { return u.name === uniqueOrName; });
|
|
1792
1792
|
if (!uniqueConstraint)
|
|
1793
|
-
throw new TypeORMError("Supplied unique constraint was not found in table "
|
|
1793
|
+
throw new TypeORMError("Supplied unique constraint was not found in table ".concat(table.name));
|
|
1794
1794
|
up = this.dropUniqueConstraintSql(table, uniqueConstraint);
|
|
1795
1795
|
down = this.createUniqueConstraintSql(table, uniqueConstraint);
|
|
1796
1796
|
return [4 /*yield*/, this.executeQueries(up, down)];
|
|
@@ -1912,7 +1912,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
1912
1912
|
table = _a;
|
|
1913
1913
|
checkConstraint = checkOrName instanceof TableCheck ? checkOrName : table.checks.find(function (c) { return c.name === checkOrName; });
|
|
1914
1914
|
if (!checkConstraint)
|
|
1915
|
-
throw new TypeORMError("Supplied check constraint was not found in table "
|
|
1915
|
+
throw new TypeORMError("Supplied check constraint was not found in table ".concat(table.name));
|
|
1916
1916
|
up = this.dropCheckConstraintSql(table, checkConstraint);
|
|
1917
1917
|
down = this.createCheckConstraintSql(table, checkConstraint);
|
|
1918
1918
|
return [4 /*yield*/, this.executeQueries(up, down)];
|
|
@@ -2014,7 +2014,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2014
2014
|
table = _a;
|
|
2015
2015
|
exclusionConstraint = exclusionOrName instanceof TableExclusion ? exclusionOrName : table.exclusions.find(function (c) { return c.name === exclusionOrName; });
|
|
2016
2016
|
if (!exclusionConstraint)
|
|
2017
|
-
throw new TypeORMError("Supplied exclusion constraint was not found in table "
|
|
2017
|
+
throw new TypeORMError("Supplied exclusion constraint was not found in table ".concat(table.name));
|
|
2018
2018
|
up = this.dropExclusionConstraintSql(table, exclusionConstraint);
|
|
2019
2019
|
down = this.createExclusionConstraintSql(table, exclusionConstraint);
|
|
2020
2020
|
return [4 /*yield*/, this.executeQueries(up, down)];
|
|
@@ -2136,7 +2136,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2136
2136
|
table = _a;
|
|
2137
2137
|
foreignKey = foreignKeyOrName instanceof TableForeignKey ? foreignKeyOrName : table.foreignKeys.find(function (fk) { return fk.name === foreignKeyOrName; });
|
|
2138
2138
|
if (!foreignKey)
|
|
2139
|
-
throw new TypeORMError("Supplied foreign key was not found in table "
|
|
2139
|
+
throw new TypeORMError("Supplied foreign key was not found in table ".concat(table.name));
|
|
2140
2140
|
up = this.dropForeignKeySql(table, foreignKey);
|
|
2141
2141
|
down = this.createForeignKeySql(table, foreignKey);
|
|
2142
2142
|
return [4 /*yield*/, this.executeQueries(up, down)];
|
|
@@ -2278,7 +2278,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2278
2278
|
table = _a;
|
|
2279
2279
|
index = indexOrName instanceof TableIndex ? indexOrName : table.indices.find(function (i) { return i.name === indexOrName; });
|
|
2280
2280
|
if (!index)
|
|
2281
|
-
throw new TypeORMError("Supplied index "
|
|
2281
|
+
throw new TypeORMError("Supplied index ".concat(indexOrName, " was not found in table ").concat(table.name));
|
|
2282
2282
|
up = this.dropIndexSql(table, index);
|
|
2283
2283
|
down = this.createIndexSql(table, index);
|
|
2284
2284
|
return [4 /*yield*/, this.executeQueries(up, down)];
|
|
@@ -2337,7 +2337,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2337
2337
|
return __awaiter(this, void 0, void 0, function () {
|
|
2338
2338
|
return __generator(this, function (_a) {
|
|
2339
2339
|
switch (_a.label) {
|
|
2340
|
-
case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE "
|
|
2340
|
+
case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE ".concat(this.escapePath(tableName)))];
|
|
2341
2341
|
case 1:
|
|
2342
2342
|
_a.sent();
|
|
2343
2343
|
return [2 /*return*/];
|
|
@@ -2381,7 +2381,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2381
2381
|
case 3:
|
|
2382
2382
|
version = _a.sent();
|
|
2383
2383
|
selectViewDropsQuery = "SELECT 'DROP VIEW IF EXISTS \"' || schemaname || '\".\"' || viewname || '\" CASCADE;' as \"query\" " +
|
|
2384
|
-
|
|
2384
|
+
"FROM \"pg_views\" WHERE \"schemaname\" IN (".concat(schemaNamesString, ") AND \"viewname\" NOT IN ('geography_columns', 'geometry_columns', 'raster_columns', 'raster_overviews')");
|
|
2385
2385
|
return [4 /*yield*/, this.query(selectViewDropsQuery)];
|
|
2386
2386
|
case 4:
|
|
2387
2387
|
dropViewQueries = _a.sent();
|
|
@@ -2390,7 +2390,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2390
2390
|
_a.sent();
|
|
2391
2391
|
if (!VersionUtils.isGreaterOrEqual(version, "9.3")) return [3 /*break*/, 8];
|
|
2392
2392
|
selectMatViewDropsQuery = "SELECT 'DROP MATERIALIZED VIEW IF EXISTS \"' || schemaname || '\".\"' || matviewname || '\" CASCADE;' as \"query\" " +
|
|
2393
|
-
|
|
2393
|
+
"FROM \"pg_matviews\" WHERE \"schemaname\" IN (".concat(schemaNamesString, ")");
|
|
2394
2394
|
return [4 /*yield*/, this.query(selectMatViewDropsQuery)];
|
|
2395
2395
|
case 6:
|
|
2396
2396
|
dropMatViewQueries = _a.sent();
|
|
@@ -2399,7 +2399,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2399
2399
|
_a.sent();
|
|
2400
2400
|
_a.label = 8;
|
|
2401
2401
|
case 8:
|
|
2402
|
-
selectTableDropsQuery = "SELECT 'DROP TABLE IF EXISTS \"' || schemaname || '\".\"' || tablename || '\" CASCADE;' as \"query\" FROM \"pg_tables\" WHERE \"schemaname\" IN ("
|
|
2402
|
+
selectTableDropsQuery = "SELECT 'DROP TABLE IF EXISTS \"' || schemaname || '\".\"' || tablename || '\" CASCADE;' as \"query\" FROM \"pg_tables\" WHERE \"schemaname\" IN (".concat(schemaNamesString, ") AND \"tablename\" NOT IN ('spatial_ref_sys')");
|
|
2403
2403
|
return [4 /*yield*/, this.query(selectTableDropsQuery)];
|
|
2404
2404
|
case 9:
|
|
2405
2405
|
dropTableQueries = _a.sent();
|
|
@@ -2467,12 +2467,12 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2467
2467
|
if (!schema) {
|
|
2468
2468
|
schema = _this.driver.options.schema || currentSchema;
|
|
2469
2469
|
}
|
|
2470
|
-
return "(\"t\".\"schema\" = '"
|
|
2470
|
+
return "(\"t\".\"schema\" = '".concat(schema, "' AND \"t\".\"name\" = '").concat(tableName, "')");
|
|
2471
2471
|
}).join(" OR ");
|
|
2472
|
-
query = "SELECT \"t\".* FROM "
|
|
2472
|
+
query = "SELECT \"t\".* FROM ".concat(this.escapePath(this.getTypeormMetadataTableName()), " \"t\" ") +
|
|
2473
2473
|
"INNER JOIN \"pg_catalog\".\"pg_class\" \"c\" ON \"c\".\"relname\" = \"t\".\"name\" " +
|
|
2474
2474
|
"INNER JOIN \"pg_namespace\" \"n\" ON \"n\".\"oid\" = \"c\".\"relnamespace\" AND \"n\".\"nspname\" = \"t\".\"schema\" " +
|
|
2475
|
-
|
|
2475
|
+
"WHERE \"t\".\"type\" IN ('".concat(MetadataTableType.VIEW, "', '").concat(MetadataTableType.MATERIALIZED_VIEW, "') ").concat(viewsCondition ? "AND (".concat(viewsCondition, ")") : "");
|
|
2476
2476
|
return [4 /*yield*/, this.query(query)];
|
|
2477
2477
|
case 4:
|
|
2478
2478
|
dbViews = _a.sent();
|
|
@@ -2525,7 +2525,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2525
2525
|
.map(function (tableName) { return _this.driver.parseTableName(tableName); })
|
|
2526
2526
|
.map(function (_a) {
|
|
2527
2527
|
var schema = _a.schema, tableName = _a.tableName;
|
|
2528
|
-
return "(\"table_schema\" = '"
|
|
2528
|
+
return "(\"table_schema\" = '".concat(schema || currentSchema, "' AND \"table_name\" = '").concat(tableName, "')");
|
|
2529
2529
|
}).join(" OR ");
|
|
2530
2530
|
tablesSql = "SELECT \"table_schema\", \"table_name\" FROM \"information_schema\".\"tables\" WHERE " + tablesCondition;
|
|
2531
2531
|
_f = (_e = dbTables.push).apply;
|
|
@@ -2542,7 +2542,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2542
2542
|
}
|
|
2543
2543
|
columnsCondition = dbTables.map(function (_a) {
|
|
2544
2544
|
var table_schema = _a.table_schema, table_name = _a.table_name;
|
|
2545
|
-
return "(\"table_schema\" = '"
|
|
2545
|
+
return "(\"table_schema\" = '".concat(table_schema, "' AND \"table_name\" = '").concat(table_name, "')");
|
|
2546
2546
|
}).join(" OR ");
|
|
2547
2547
|
columnsSql = "SELECT columns.*, pg_catalog.col_description(('\"' || table_catalog || '\".\"' || table_schema || '\".\"' || table_name || '\"')::regclass::oid, ordinal_position) AS description, " +
|
|
2548
2548
|
"('\"' || \"udt_schema\" || '\".\"' || \"udt_name\" || '\"')::\"regtype\" AS \"regtype\", pg_catalog.format_type(\"col_attr\".\"atttypid\", \"col_attr\".\"atttypmod\") AS \"format_type\" " +
|
|
@@ -2557,7 +2557,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2557
2557
|
"WHERE " + columnsCondition;
|
|
2558
2558
|
constraintsCondition = dbTables.map(function (_a) {
|
|
2559
2559
|
var table_schema = _a.table_schema, table_name = _a.table_name;
|
|
2560
|
-
return "(\"ns\".\"nspname\" = '"
|
|
2560
|
+
return "(\"ns\".\"nspname\" = '".concat(table_schema, "' AND \"t\".\"relname\" = '").concat(table_name, "')");
|
|
2561
2561
|
}).join(" OR ");
|
|
2562
2562
|
constraintsSql = "SELECT \"ns\".\"nspname\" AS \"table_schema\", \"t\".\"relname\" AS \"table_name\", \"cnst\".\"conname\" AS \"constraint_name\", " +
|
|
2563
2563
|
"pg_get_constraintdef(\"cnst\".\"oid\") AS \"expression\", " +
|
|
@@ -2566,7 +2566,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2566
2566
|
"INNER JOIN \"pg_class\" \"t\" ON \"t\".\"oid\" = \"cnst\".\"conrelid\" " +
|
|
2567
2567
|
"INNER JOIN \"pg_namespace\" \"ns\" ON \"ns\".\"oid\" = \"cnst\".\"connamespace\" " +
|
|
2568
2568
|
"LEFT JOIN \"pg_attribute\" \"a\" ON \"a\".\"attrelid\" = \"cnst\".\"conrelid\" AND \"a\".\"attnum\" = ANY (\"cnst\".\"conkey\") " +
|
|
2569
|
-
|
|
2569
|
+
"WHERE \"t\".\"relkind\" IN ('r', 'p') AND (".concat(constraintsCondition, ")");
|
|
2570
2570
|
indicesSql = "SELECT \"ns\".\"nspname\" AS \"table_schema\", \"t\".\"relname\" AS \"table_name\", \"i\".\"relname\" AS \"constraint_name\", \"a\".\"attname\" AS \"column_name\", " +
|
|
2571
2571
|
"CASE \"ix\".\"indisunique\" WHEN 't' THEN 'TRUE' ELSE'FALSE' END AS \"is_unique\", pg_get_expr(\"ix\".\"indpred\", \"ix\".\"indrelid\") AS \"condition\", " +
|
|
2572
2572
|
"\"types\".\"typname\" AS \"type_name\" " +
|
|
@@ -2577,10 +2577,10 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2577
2577
|
"INNER JOIN \"pg_class\" \"i\" ON \"i\".\"oid\" = \"ix\".\"indexrelid\" " +
|
|
2578
2578
|
"INNER JOIN \"pg_type\" \"types\" ON \"types\".\"oid\" = \"a\".\"atttypid\" " +
|
|
2579
2579
|
"LEFT JOIN \"pg_constraint\" \"cnst\" ON \"cnst\".\"conname\" = \"i\".\"relname\" " +
|
|
2580
|
-
|
|
2580
|
+
"WHERE \"t\".\"relkind\" IN ('r', 'p') AND \"cnst\".\"contype\" IS NULL AND (".concat(constraintsCondition, ")");
|
|
2581
2581
|
foreignKeysCondition = dbTables.map(function (_a) {
|
|
2582
2582
|
var table_schema = _a.table_schema, table_name = _a.table_name;
|
|
2583
|
-
return "(\"ns\".\"nspname\" = '"
|
|
2583
|
+
return "(\"ns\".\"nspname\" = '".concat(table_schema, "' AND \"cl\".\"relname\" = '").concat(table_name, "')");
|
|
2584
2584
|
}).join(" OR ");
|
|
2585
2585
|
return [4 /*yield*/, this.hasSupportForPartitionedTables()];
|
|
2586
2586
|
case 7:
|
|
@@ -2598,10 +2598,10 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2598
2598
|
"FROM \"pg_class\" \"cl\" " +
|
|
2599
2599
|
"INNER JOIN \"pg_namespace\" \"ns\" ON \"cl\".\"relnamespace\" = \"ns\".\"oid\" " +
|
|
2600
2600
|
"INNER JOIN \"pg_constraint\" \"con1\" ON \"con1\".\"conrelid\" = \"cl\".\"oid\" " +
|
|
2601
|
-
|
|
2601
|
+
"WHERE \"con1\".\"contype\" = 'f' AND (".concat(foreignKeysCondition, ") ") +
|
|
2602
2602
|
") \"con\" " +
|
|
2603
2603
|
"INNER JOIN \"pg_attribute\" \"att\" ON \"att\".\"attrelid\" = \"con\".\"confrelid\" AND \"att\".\"attnum\" = \"con\".\"child\" " +
|
|
2604
|
-
|
|
2604
|
+
"INNER JOIN \"pg_class\" \"cl\" ON \"cl\".\"oid\" = \"con\".\"confrelid\" ".concat(isPartitionCondition) +
|
|
2605
2605
|
"INNER JOIN \"pg_namespace\" \"ns\" ON \"cl\".\"relnamespace\" = \"ns\".\"oid\" " +
|
|
2606
2606
|
"INNER JOIN \"pg_attribute\" \"att2\" ON \"att2\".\"attrelid\" = \"con\".\"conrelid\" AND \"att2\".\"attnum\" = \"con\".\"parent\"";
|
|
2607
2607
|
return [4 /*yield*/, Promise.all([
|
|
@@ -2680,7 +2680,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2680
2680
|
sql = "SELECT \"e\".\"enumlabel\" AS \"value\" FROM \"pg_enum\" \"e\" " +
|
|
2681
2681
|
"INNER JOIN \"pg_type\" \"t\" ON \"t\".\"oid\" = \"e\".\"enumtypid\" " +
|
|
2682
2682
|
"INNER JOIN \"pg_namespace\" \"n\" ON \"n\".\"oid\" = \"t\".\"typnamespace\" " +
|
|
2683
|
-
|
|
2683
|
+
"WHERE \"n\".\"nspname\" = '".concat(dbTable["table_schema"], "' AND \"t\".\"typname\" = '").concat(enumName || name_1, "'");
|
|
2684
2684
|
return [4 /*yield*/, this.query(sql)];
|
|
2685
2685
|
case 2:
|
|
2686
2686
|
results = _a.sent();
|
|
@@ -2697,7 +2697,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2697
2697
|
_a.label = 3;
|
|
2698
2698
|
case 3:
|
|
2699
2699
|
if (!(tableColumn.type === "geometry")) return [3 /*break*/, 5];
|
|
2700
|
-
geometryColumnSql = "SELECT * FROM (\n SELECT\n \"f_table_schema\" \"table_schema\",\n \"f_table_name\" \"table_name\",\n \"f_geometry_column\" \"column_name\",\n \"srid\",\n \"type\"\n FROM \"geometry_columns\"\n ) AS _\n WHERE\n \"column_name\" = '"
|
|
2700
|
+
geometryColumnSql = "SELECT * FROM (\n SELECT\n \"f_table_schema\" \"table_schema\",\n \"f_table_name\" \"table_name\",\n \"f_geometry_column\" \"column_name\",\n \"srid\",\n \"type\"\n FROM \"geometry_columns\"\n ) AS _\n WHERE\n \"column_name\" = '".concat(dbColumn["column_name"], "' AND\n \"table_schema\" = '").concat(dbColumn["table_schema"], "' AND\n \"table_name\" = '").concat(dbColumn["table_name"], "'");
|
|
2701
2701
|
return [4 /*yield*/, this.query(geometryColumnSql)];
|
|
2702
2702
|
case 4:
|
|
2703
2703
|
results = _a.sent();
|
|
@@ -2708,7 +2708,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2708
2708
|
_a.label = 5;
|
|
2709
2709
|
case 5:
|
|
2710
2710
|
if (!(tableColumn.type === "geography")) return [3 /*break*/, 7];
|
|
2711
|
-
geographyColumnSql = "SELECT * FROM (\n SELECT\n \"f_table_schema\" \"table_schema\",\n \"f_table_name\" \"table_name\",\n \"f_geography_column\" \"column_name\",\n \"srid\",\n \"type\"\n FROM \"geography_columns\"\n ) AS _\n WHERE\n \"column_name\" = '"
|
|
2711
|
+
geographyColumnSql = "SELECT * FROM (\n SELECT\n \"f_table_schema\" \"table_schema\",\n \"f_table_name\" \"table_name\",\n \"f_geography_column\" \"column_name\",\n \"srid\",\n \"type\"\n FROM \"geography_columns\"\n ) AS _\n WHERE\n \"column_name\" = '".concat(dbColumn["column_name"], "' AND\n \"table_schema\" = '").concat(dbColumn["table_schema"], "' AND\n \"table_name\" = '").concat(dbColumn["table_name"], "'");
|
|
2712
2712
|
return [4 /*yield*/, this.query(geographyColumnSql)];
|
|
2713
2713
|
case 6:
|
|
2714
2714
|
results = _a.sent();
|
|
@@ -2746,8 +2746,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2746
2746
|
tableColumn.generatedIdentity = dbColumn.identity_generation;
|
|
2747
2747
|
}
|
|
2748
2748
|
else if (dbColumn["column_default"] !== null && dbColumn["column_default"] !== undefined) {
|
|
2749
|
-
serialDefaultName = "nextval('"
|
|
2750
|
-
serialDefaultPath = "nextval('"
|
|
2749
|
+
serialDefaultName = "nextval('".concat(this.buildSequenceName(table, dbColumn["column_name"]), "'::regclass)");
|
|
2750
|
+
serialDefaultPath = "nextval('".concat(this.buildSequencePath(table, dbColumn["column_name"]), "'::regclass)");
|
|
2751
2751
|
defaultWithoutQuotes = dbColumn["column_default"].replace(/"/g, "");
|
|
2752
2752
|
if (defaultWithoutQuotes === serialDefaultName || defaultWithoutQuotes === serialDefaultPath) {
|
|
2753
2753
|
tableColumn.isGenerated = true;
|
|
@@ -2768,12 +2768,12 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2768
2768
|
if (!(dbColumn["is_generated"] === "ALWAYS" && dbColumn["generation_expression"])) return [3 /*break*/, 9];
|
|
2769
2769
|
// In postgres there is no VIRTUAL generated column type
|
|
2770
2770
|
tableColumn.generatedType = "STORED";
|
|
2771
|
-
asExpressionQuery = "SELECT * FROM \""
|
|
2772
|
-
+
|
|
2773
|
-
+
|
|
2774
|
-
+
|
|
2775
|
-
+
|
|
2776
|
-
+
|
|
2771
|
+
asExpressionQuery = "SELECT * FROM \"".concat(this.connection.metadataTableName, "\" ")
|
|
2772
|
+
+ " WHERE \"table\" = '".concat(dbTable["table_name"], "'")
|
|
2773
|
+
+ " AND \"name\" = '".concat(tableColumn.name, "'")
|
|
2774
|
+
+ " AND \"schema\" = '".concat(dbTable["table_schema"], "'")
|
|
2775
|
+
+ " AND \"database\" = '".concat(this.driver.database, "'")
|
|
2776
|
+
+ " AND \"type\" = '".concat(MetadataTableType.GENERATED_COLUMN, "'");
|
|
2777
2777
|
return [4 /*yield*/, this.query(asExpressionQuery)];
|
|
2778
2778
|
case 8:
|
|
2779
2779
|
results = _a.sent();
|
|
@@ -2888,7 +2888,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2888
2888
|
PostgresQueryRunner.prototype.createTableSql = function (table, createForeignKeys) {
|
|
2889
2889
|
var _this = this;
|
|
2890
2890
|
var columnDefinitions = table.columns.map(function (column) { return _this.buildCreateColumnSql(table, column); }).join(", ");
|
|
2891
|
-
var sql = "CREATE TABLE "
|
|
2891
|
+
var sql = "CREATE TABLE ".concat(this.escapePath(table), " (").concat(columnDefinitions);
|
|
2892
2892
|
table.columns
|
|
2893
2893
|
.filter(function (column) { return column.isUnique; })
|
|
2894
2894
|
.forEach(function (column) {
|
|
@@ -2902,55 +2902,55 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2902
2902
|
if (table.uniques.length > 0) {
|
|
2903
2903
|
var uniquesSql = table.uniques.map(function (unique) {
|
|
2904
2904
|
var uniqueName = unique.name ? unique.name : _this.connection.namingStrategy.uniqueConstraintName(table, unique.columnNames);
|
|
2905
|
-
var columnNames = unique.columnNames.map(function (columnName) { return "\""
|
|
2906
|
-
var constraint = "CONSTRAINT \""
|
|
2905
|
+
var columnNames = unique.columnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
|
|
2906
|
+
var constraint = "CONSTRAINT \"".concat(uniqueName, "\" UNIQUE (").concat(columnNames, ")");
|
|
2907
2907
|
if (unique.deferrable)
|
|
2908
|
-
constraint += " DEFERRABLE "
|
|
2908
|
+
constraint += " DEFERRABLE ".concat(unique.deferrable);
|
|
2909
2909
|
return constraint;
|
|
2910
2910
|
}).join(", ");
|
|
2911
|
-
sql += ", "
|
|
2911
|
+
sql += ", ".concat(uniquesSql);
|
|
2912
2912
|
}
|
|
2913
2913
|
if (table.checks.length > 0) {
|
|
2914
2914
|
var checksSql = table.checks.map(function (check) {
|
|
2915
2915
|
var checkName = check.name ? check.name : _this.connection.namingStrategy.checkConstraintName(table, check.expression);
|
|
2916
|
-
return "CONSTRAINT \""
|
|
2916
|
+
return "CONSTRAINT \"".concat(checkName, "\" CHECK (").concat(check.expression, ")");
|
|
2917
2917
|
}).join(", ");
|
|
2918
|
-
sql += ", "
|
|
2918
|
+
sql += ", ".concat(checksSql);
|
|
2919
2919
|
}
|
|
2920
2920
|
if (table.exclusions.length > 0) {
|
|
2921
2921
|
var exclusionsSql = table.exclusions.map(function (exclusion) {
|
|
2922
2922
|
var exclusionName = exclusion.name ? exclusion.name : _this.connection.namingStrategy.exclusionConstraintName(table, exclusion.expression);
|
|
2923
|
-
return "CONSTRAINT \""
|
|
2923
|
+
return "CONSTRAINT \"".concat(exclusionName, "\" EXCLUDE ").concat(exclusion.expression);
|
|
2924
2924
|
}).join(", ");
|
|
2925
|
-
sql += ", "
|
|
2925
|
+
sql += ", ".concat(exclusionsSql);
|
|
2926
2926
|
}
|
|
2927
2927
|
if (table.foreignKeys.length > 0 && createForeignKeys) {
|
|
2928
2928
|
var foreignKeysSql = table.foreignKeys.map(function (fk) {
|
|
2929
|
-
var columnNames = fk.columnNames.map(function (columnName) { return "\""
|
|
2929
|
+
var columnNames = fk.columnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
|
|
2930
2930
|
if (!fk.name)
|
|
2931
2931
|
fk.name = _this.connection.namingStrategy.foreignKeyName(table, fk.columnNames, _this.getTablePath(fk), fk.referencedColumnNames);
|
|
2932
|
-
var referencedColumnNames = fk.referencedColumnNames.map(function (columnName) { return "\""
|
|
2933
|
-
var constraint = "CONSTRAINT \""
|
|
2932
|
+
var referencedColumnNames = fk.referencedColumnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
|
|
2933
|
+
var constraint = "CONSTRAINT \"".concat(fk.name, "\" FOREIGN KEY (").concat(columnNames, ") REFERENCES ").concat(_this.escapePath(_this.getTablePath(fk)), " (").concat(referencedColumnNames, ")");
|
|
2934
2934
|
if (fk.onDelete)
|
|
2935
|
-
constraint += " ON DELETE "
|
|
2935
|
+
constraint += " ON DELETE ".concat(fk.onDelete);
|
|
2936
2936
|
if (fk.onUpdate)
|
|
2937
|
-
constraint += " ON UPDATE "
|
|
2937
|
+
constraint += " ON UPDATE ".concat(fk.onUpdate);
|
|
2938
2938
|
if (fk.deferrable)
|
|
2939
|
-
constraint += " DEFERRABLE "
|
|
2939
|
+
constraint += " DEFERRABLE ".concat(fk.deferrable);
|
|
2940
2940
|
return constraint;
|
|
2941
2941
|
}).join(", ");
|
|
2942
|
-
sql += ", "
|
|
2942
|
+
sql += ", ".concat(foreignKeysSql);
|
|
2943
2943
|
}
|
|
2944
2944
|
var primaryColumns = table.columns.filter(function (column) { return column.isPrimary; });
|
|
2945
2945
|
if (primaryColumns.length > 0) {
|
|
2946
2946
|
var primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, primaryColumns.map(function (column) { return column.name; }));
|
|
2947
|
-
var columnNames = primaryColumns.map(function (column) { return "\""
|
|
2948
|
-
sql += ", CONSTRAINT \""
|
|
2947
|
+
var columnNames = primaryColumns.map(function (column) { return "\"".concat(column.name, "\""); }).join(", ");
|
|
2948
|
+
sql += ", CONSTRAINT \"".concat(primaryKeyName, "\" PRIMARY KEY (").concat(columnNames, ")");
|
|
2949
2949
|
}
|
|
2950
2950
|
sql += ")";
|
|
2951
2951
|
table.columns
|
|
2952
2952
|
.filter(function (it) { return it.comment; })
|
|
2953
|
-
.forEach(function (it) { return sql += "; COMMENT ON COLUMN "
|
|
2953
|
+
.forEach(function (it) { return sql += "; COMMENT ON COLUMN ".concat(_this.escapePath(table), ".\"").concat(it.name, "\" IS ").concat(_this.escapeComment(it.comment)); });
|
|
2954
2954
|
return new Query(sql);
|
|
2955
2955
|
};
|
|
2956
2956
|
/**
|
|
@@ -2973,16 +2973,16 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
2973
2973
|
* Builds drop table sql.
|
|
2974
2974
|
*/
|
|
2975
2975
|
PostgresQueryRunner.prototype.dropTableSql = function (tableOrPath) {
|
|
2976
|
-
return new Query("DROP TABLE "
|
|
2976
|
+
return new Query("DROP TABLE ".concat(this.escapePath(tableOrPath)));
|
|
2977
2977
|
};
|
|
2978
2978
|
PostgresQueryRunner.prototype.createViewSql = function (view) {
|
|
2979
2979
|
var materializedClause = view.materialized ? "MATERIALIZED " : "";
|
|
2980
2980
|
var viewName = this.escapePath(view);
|
|
2981
2981
|
if (typeof view.expression === "string") {
|
|
2982
|
-
return new Query("CREATE "
|
|
2982
|
+
return new Query("CREATE ".concat(materializedClause, "VIEW ").concat(viewName, " AS ").concat(view.expression));
|
|
2983
2983
|
}
|
|
2984
2984
|
else {
|
|
2985
|
-
return new Query("CREATE "
|
|
2985
|
+
return new Query("CREATE ".concat(materializedClause, "VIEW ").concat(viewName, " AS ").concat(view.expression(this.connection).getQuery()));
|
|
2986
2986
|
}
|
|
2987
2987
|
};
|
|
2988
2988
|
PostgresQueryRunner.prototype.insertViewDefinitionSql = function (view) {
|
|
@@ -3009,7 +3009,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3009
3009
|
*/
|
|
3010
3010
|
PostgresQueryRunner.prototype.dropViewSql = function (view) {
|
|
3011
3011
|
var materializedClause = view.materialized ? "MATERIALIZED " : "";
|
|
3012
|
-
return new Query("DROP "
|
|
3012
|
+
return new Query("DROP ".concat(materializedClause, "VIEW ").concat(this.escapePath(view)));
|
|
3013
3013
|
};
|
|
3014
3014
|
/**
|
|
3015
3015
|
* Builds remove view sql.
|
|
@@ -3045,7 +3045,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3045
3045
|
selectDropsQuery = "SELECT 'DROP TYPE IF EXISTS \"' || n.nspname || '\".\"' || t.typname || '\" CASCADE;' as \"query\" FROM \"pg_type\" \"t\" " +
|
|
3046
3046
|
"INNER JOIN \"pg_enum\" \"e\" ON \"e\".\"enumtypid\" = \"t\".\"oid\" " +
|
|
3047
3047
|
"INNER JOIN \"pg_namespace\" \"n\" ON \"n\".\"oid\" = \"t\".\"typnamespace\" " +
|
|
3048
|
-
|
|
3048
|
+
"WHERE \"n\".\"nspname\" IN (".concat(schemaNames, ") GROUP BY \"n\".\"nspname\", \"t\".\"typname\"");
|
|
3049
3049
|
return [4 /*yield*/, this.query(selectDropsQuery)];
|
|
3050
3050
|
case 1:
|
|
3051
3051
|
dropQueries = _a.sent();
|
|
@@ -3076,7 +3076,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3076
3076
|
enumName = this.buildEnumName(table, column, false, true);
|
|
3077
3077
|
sql = "SELECT \"n\".\"nspname\", \"t\".\"typname\" FROM \"pg_type\" \"t\" " +
|
|
3078
3078
|
"INNER JOIN \"pg_namespace\" \"n\" ON \"n\".\"oid\" = \"t\".\"typnamespace\" " +
|
|
3079
|
-
|
|
3079
|
+
"WHERE \"n\".\"nspname\" = '".concat(schema, "' AND \"t\".\"typname\" = '").concat(enumName, "'");
|
|
3080
3080
|
return [4 /*yield*/, this.query(sql)];
|
|
3081
3081
|
case 3:
|
|
3082
3082
|
result = _a.sent();
|
|
@@ -3091,8 +3091,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3091
3091
|
PostgresQueryRunner.prototype.createEnumTypeSql = function (table, column, enumName) {
|
|
3092
3092
|
if (!enumName)
|
|
3093
3093
|
enumName = this.buildEnumName(table, column);
|
|
3094
|
-
var enumValues = column.enum.map(function (value) { return "'"
|
|
3095
|
-
return new Query("CREATE TYPE "
|
|
3094
|
+
var enumValues = column.enum.map(function (value) { return "'".concat(value.replace("'", "''"), "'"); }).join(", ");
|
|
3095
|
+
return new Query("CREATE TYPE ".concat(enumName, " AS ENUM(").concat(enumValues, ")"));
|
|
3096
3096
|
};
|
|
3097
3097
|
/**
|
|
3098
3098
|
* Builds create ENUM type sql.
|
|
@@ -3100,14 +3100,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3100
3100
|
PostgresQueryRunner.prototype.dropEnumTypeSql = function (table, column, enumName) {
|
|
3101
3101
|
if (!enumName)
|
|
3102
3102
|
enumName = this.buildEnumName(table, column);
|
|
3103
|
-
return new Query("DROP TYPE "
|
|
3103
|
+
return new Query("DROP TYPE ".concat(enumName));
|
|
3104
3104
|
};
|
|
3105
3105
|
/**
|
|
3106
3106
|
* Builds create index sql.
|
|
3107
3107
|
*/
|
|
3108
3108
|
PostgresQueryRunner.prototype.createIndexSql = function (table, index) {
|
|
3109
|
-
var columns = index.columnNames.map(function (columnName) { return "\""
|
|
3110
|
-
return new Query("CREATE "
|
|
3109
|
+
var columns = index.columnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
|
|
3110
|
+
return new Query("CREATE ".concat(index.isUnique ? "UNIQUE " : "", "INDEX \"").concat(index.name, "\" ON ").concat(this.escapePath(table), " ").concat(index.isSpatial ? "USING GiST " : "", "(").concat(columns, ") ").concat(index.where ? "WHERE " + index.where : ""));
|
|
3111
3111
|
};
|
|
3112
3112
|
/**
|
|
3113
3113
|
* Builds drop index sql.
|
|
@@ -3115,15 +3115,15 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3115
3115
|
PostgresQueryRunner.prototype.dropIndexSql = function (table, indexOrName) {
|
|
3116
3116
|
var indexName = indexOrName instanceof TableIndex ? indexOrName.name : indexOrName;
|
|
3117
3117
|
var schema = this.driver.parseTableName(table).schema;
|
|
3118
|
-
return schema ? new Query("DROP INDEX \""
|
|
3118
|
+
return schema ? new Query("DROP INDEX \"".concat(schema, "\".\"").concat(indexName, "\"")) : new Query("DROP INDEX \"".concat(indexName, "\""));
|
|
3119
3119
|
};
|
|
3120
3120
|
/**
|
|
3121
3121
|
* Builds create primary key sql.
|
|
3122
3122
|
*/
|
|
3123
3123
|
PostgresQueryRunner.prototype.createPrimaryKeySql = function (table, columnNames) {
|
|
3124
3124
|
var primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, columnNames);
|
|
3125
|
-
var columnNamesString = columnNames.map(function (columnName) { return "\""
|
|
3126
|
-
return new Query("ALTER TABLE "
|
|
3125
|
+
var columnNamesString = columnNames.map(function (columnName) { return "\"".concat(columnName, "\""); }).join(", ");
|
|
3126
|
+
return new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(primaryKeyName, "\" PRIMARY KEY (").concat(columnNamesString, ")"));
|
|
3127
3127
|
};
|
|
3128
3128
|
/**
|
|
3129
3129
|
* Builds drop primary key sql.
|
|
@@ -3131,16 +3131,16 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3131
3131
|
PostgresQueryRunner.prototype.dropPrimaryKeySql = function (table) {
|
|
3132
3132
|
var columnNames = table.primaryColumns.map(function (column) { return column.name; });
|
|
3133
3133
|
var primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, columnNames);
|
|
3134
|
-
return new Query("ALTER TABLE "
|
|
3134
|
+
return new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(primaryKeyName, "\""));
|
|
3135
3135
|
};
|
|
3136
3136
|
/**
|
|
3137
3137
|
* Builds create unique constraint sql.
|
|
3138
3138
|
*/
|
|
3139
3139
|
PostgresQueryRunner.prototype.createUniqueConstraintSql = function (table, uniqueConstraint) {
|
|
3140
3140
|
var columnNames = uniqueConstraint.columnNames.map(function (column) { return "\"" + column + "\""; }).join(", ");
|
|
3141
|
-
var sql = "ALTER TABLE "
|
|
3141
|
+
var sql = "ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(uniqueConstraint.name, "\" UNIQUE (").concat(columnNames, ")");
|
|
3142
3142
|
if (uniqueConstraint.deferrable)
|
|
3143
|
-
sql += " DEFERRABLE "
|
|
3143
|
+
sql += " DEFERRABLE ".concat(uniqueConstraint.deferrable);
|
|
3144
3144
|
return new Query(sql);
|
|
3145
3145
|
};
|
|
3146
3146
|
/**
|
|
@@ -3148,33 +3148,33 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3148
3148
|
*/
|
|
3149
3149
|
PostgresQueryRunner.prototype.dropUniqueConstraintSql = function (table, uniqueOrName) {
|
|
3150
3150
|
var uniqueName = uniqueOrName instanceof TableUnique ? uniqueOrName.name : uniqueOrName;
|
|
3151
|
-
return new Query("ALTER TABLE "
|
|
3151
|
+
return new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(uniqueName, "\""));
|
|
3152
3152
|
};
|
|
3153
3153
|
/**
|
|
3154
3154
|
* Builds create check constraint sql.
|
|
3155
3155
|
*/
|
|
3156
3156
|
PostgresQueryRunner.prototype.createCheckConstraintSql = function (table, checkConstraint) {
|
|
3157
|
-
return new Query("ALTER TABLE "
|
|
3157
|
+
return new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(checkConstraint.name, "\" CHECK (").concat(checkConstraint.expression, ")"));
|
|
3158
3158
|
};
|
|
3159
3159
|
/**
|
|
3160
3160
|
* Builds drop check constraint sql.
|
|
3161
3161
|
*/
|
|
3162
3162
|
PostgresQueryRunner.prototype.dropCheckConstraintSql = function (table, checkOrName) {
|
|
3163
3163
|
var checkName = checkOrName instanceof TableCheck ? checkOrName.name : checkOrName;
|
|
3164
|
-
return new Query("ALTER TABLE "
|
|
3164
|
+
return new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(checkName, "\""));
|
|
3165
3165
|
};
|
|
3166
3166
|
/**
|
|
3167
3167
|
* Builds create exclusion constraint sql.
|
|
3168
3168
|
*/
|
|
3169
3169
|
PostgresQueryRunner.prototype.createExclusionConstraintSql = function (table, exclusionConstraint) {
|
|
3170
|
-
return new Query("ALTER TABLE "
|
|
3170
|
+
return new Query("ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(exclusionConstraint.name, "\" EXCLUDE ").concat(exclusionConstraint.expression));
|
|
3171
3171
|
};
|
|
3172
3172
|
/**
|
|
3173
3173
|
* Builds drop exclusion constraint sql.
|
|
3174
3174
|
*/
|
|
3175
3175
|
PostgresQueryRunner.prototype.dropExclusionConstraintSql = function (table, exclusionOrName) {
|
|
3176
3176
|
var exclusionName = exclusionOrName instanceof TableExclusion ? exclusionOrName.name : exclusionOrName;
|
|
3177
|
-
return new Query("ALTER TABLE "
|
|
3177
|
+
return new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(exclusionName, "\""));
|
|
3178
3178
|
};
|
|
3179
3179
|
/**
|
|
3180
3180
|
* Builds create foreign key sql.
|
|
@@ -3182,14 +3182,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3182
3182
|
PostgresQueryRunner.prototype.createForeignKeySql = function (table, foreignKey) {
|
|
3183
3183
|
var columnNames = foreignKey.columnNames.map(function (column) { return "\"" + column + "\""; }).join(", ");
|
|
3184
3184
|
var referencedColumnNames = foreignKey.referencedColumnNames.map(function (column) { return "\"" + column + "\""; }).join(",");
|
|
3185
|
-
var sql = "ALTER TABLE "
|
|
3186
|
-
|
|
3185
|
+
var sql = "ALTER TABLE ".concat(this.escapePath(table), " ADD CONSTRAINT \"").concat(foreignKey.name, "\" FOREIGN KEY (").concat(columnNames, ") ") +
|
|
3186
|
+
"REFERENCES ".concat(this.escapePath(this.getTablePath(foreignKey)), "(").concat(referencedColumnNames, ")");
|
|
3187
3187
|
if (foreignKey.onDelete)
|
|
3188
|
-
sql += " ON DELETE "
|
|
3188
|
+
sql += " ON DELETE ".concat(foreignKey.onDelete);
|
|
3189
3189
|
if (foreignKey.onUpdate)
|
|
3190
|
-
sql += " ON UPDATE "
|
|
3190
|
+
sql += " ON UPDATE ".concat(foreignKey.onUpdate);
|
|
3191
3191
|
if (foreignKey.deferrable)
|
|
3192
|
-
sql += " DEFERRABLE "
|
|
3192
|
+
sql += " DEFERRABLE ".concat(foreignKey.deferrable);
|
|
3193
3193
|
return new Query(sql);
|
|
3194
3194
|
};
|
|
3195
3195
|
/**
|
|
@@ -3197,7 +3197,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3197
3197
|
*/
|
|
3198
3198
|
PostgresQueryRunner.prototype.dropForeignKeySql = function (table, foreignKeyOrName) {
|
|
3199
3199
|
var foreignKeyName = foreignKeyOrName instanceof TableForeignKey ? foreignKeyOrName.name : foreignKeyOrName;
|
|
3200
|
-
return new Query("ALTER TABLE "
|
|
3200
|
+
return new Query("ALTER TABLE ".concat(this.escapePath(table), " DROP CONSTRAINT \"").concat(foreignKeyName, "\""));
|
|
3201
3201
|
};
|
|
3202
3202
|
/**
|
|
3203
3203
|
* Builds sequence name from given table and column.
|
|
@@ -3205,16 +3205,16 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3205
3205
|
PostgresQueryRunner.prototype.buildSequenceName = function (table, columnOrName) {
|
|
3206
3206
|
var tableName = this.driver.parseTableName(table).tableName;
|
|
3207
3207
|
var columnName = columnOrName instanceof TableColumn ? columnOrName.name : columnOrName;
|
|
3208
|
-
var seqName = tableName
|
|
3208
|
+
var seqName = "".concat(tableName, "_").concat(columnName, "_seq");
|
|
3209
3209
|
if (seqName.length > this.connection.driver.maxAliasLength) {
|
|
3210
3210
|
// note doesn't yet handle corner cases where .length differs from number of UTF-8 bytes
|
|
3211
|
-
seqName = tableName.substring(0, 29)
|
|
3211
|
+
seqName = "".concat(tableName.substring(0, 29), "_").concat(columnName.substring(0, Math.max(29, 63 - (table.name.length) - 5)), "_seq");
|
|
3212
3212
|
}
|
|
3213
3213
|
return seqName;
|
|
3214
3214
|
};
|
|
3215
3215
|
PostgresQueryRunner.prototype.buildSequencePath = function (table, columnOrName) {
|
|
3216
3216
|
var schema = this.driver.parseTableName(table).schema;
|
|
3217
|
-
return schema ? schema
|
|
3217
|
+
return schema ? "".concat(schema, ".").concat(this.buildSequenceName(table, columnOrName)) : this.buildSequenceName(table, columnOrName);
|
|
3218
3218
|
};
|
|
3219
3219
|
/**
|
|
3220
3220
|
* Builds ENUM type name from given table and column.
|
|
@@ -3222,13 +3222,13 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3222
3222
|
PostgresQueryRunner.prototype.buildEnumName = function (table, column, withSchema, disableEscape, toOld) {
|
|
3223
3223
|
if (withSchema === void 0) { withSchema = true; }
|
|
3224
3224
|
var _a = this.driver.parseTableName(table), schema = _a.schema, tableName = _a.tableName;
|
|
3225
|
-
var enumName = column.enumName ? column.enumName : tableName
|
|
3225
|
+
var enumName = column.enumName ? column.enumName : "".concat(tableName, "_").concat(column.name.toLowerCase(), "_enum");
|
|
3226
3226
|
if (schema && withSchema)
|
|
3227
|
-
enumName = schema
|
|
3227
|
+
enumName = "".concat(schema, ".").concat(enumName);
|
|
3228
3228
|
if (toOld)
|
|
3229
3229
|
enumName = enumName + "_old";
|
|
3230
3230
|
return enumName.split(".").map(function (i) {
|
|
3231
|
-
return disableEscape ? i : "\""
|
|
3231
|
+
return disableEscape ? i : "\"".concat(i, "\"");
|
|
3232
3232
|
}).join(".");
|
|
3233
3233
|
};
|
|
3234
3234
|
PostgresQueryRunner.prototype.getUserDefinedTypeName = function (table, column) {
|
|
@@ -3244,7 +3244,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3244
3244
|
schema = _b.sent();
|
|
3245
3245
|
_b.label = 2;
|
|
3246
3246
|
case 2: return [4 /*yield*/, this.query("SELECT \"udt_schema\", \"udt_name\" " +
|
|
3247
|
-
|
|
3247
|
+
"FROM \"information_schema\".\"columns\" WHERE \"table_schema\" = '".concat(schema, "' AND \"table_name\" = '").concat(name, "' AND \"column_name\"='").concat(column.name, "'"))];
|
|
3248
3248
|
case 3:
|
|
3249
3249
|
result = _b.sent();
|
|
3250
3250
|
udtName = result[0]["udt_name"];
|
|
@@ -3269,7 +3269,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3269
3269
|
comment = comment
|
|
3270
3270
|
.replace(/'/g, "''")
|
|
3271
3271
|
.replace(/\u0000/g, ""); // Null bytes aren't allowed in comments
|
|
3272
|
-
return "'"
|
|
3272
|
+
return "'".concat(comment, "'");
|
|
3273
3273
|
};
|
|
3274
3274
|
/**
|
|
3275
3275
|
* Escapes given table or view path.
|
|
@@ -3277,9 +3277,9 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3277
3277
|
PostgresQueryRunner.prototype.escapePath = function (target) {
|
|
3278
3278
|
var _a = this.driver.parseTableName(target), schema = _a.schema, tableName = _a.tableName;
|
|
3279
3279
|
if (schema && schema !== this.driver.searchSchema) {
|
|
3280
|
-
return "\""
|
|
3280
|
+
return "\"".concat(schema, "\".\"").concat(tableName, "\"");
|
|
3281
3281
|
}
|
|
3282
|
-
return "\""
|
|
3282
|
+
return "\"".concat(tableName, "\"");
|
|
3283
3283
|
};
|
|
3284
3284
|
/**
|
|
3285
3285
|
* Get the table name with table schema
|
|
@@ -3297,8 +3297,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3297
3297
|
case 1:
|
|
3298
3298
|
schemaResult = _a.sent();
|
|
3299
3299
|
schema = schemaResult[0]["current_schema"];
|
|
3300
|
-
return [2 /*return*/, schema
|
|
3301
|
-
case 2: return [2 /*return*/, tableName.split(".")[0]
|
|
3300
|
+
return [2 /*return*/, "".concat(schema, ".").concat(tableName)];
|
|
3301
|
+
case 2: return [2 /*return*/, "".concat(tableName.split(".")[0], ".").concat(tableName.split(".")[1])];
|
|
3302
3302
|
}
|
|
3303
3303
|
});
|
|
3304
3304
|
});
|
|
@@ -3311,7 +3311,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3311
3311
|
if (column.isGenerated === true && column.generationStrategy !== "uuid") {
|
|
3312
3312
|
if (column.generationStrategy === "identity") { // Postgres 10+ Identity generated column
|
|
3313
3313
|
var generatedIdentityOrDefault = column.generatedIdentity || "BY DEFAULT";
|
|
3314
|
-
c += " "
|
|
3314
|
+
c += " ".concat(column.type, " GENERATED ").concat(generatedIdentityOrDefault, " AS IDENTITY");
|
|
3315
3315
|
}
|
|
3316
3316
|
else { // classic SERIAL primary column
|
|
3317
3317
|
if (column.type === "integer" || column.type === "int" || column.type === "int4")
|
|
@@ -3333,7 +3333,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3333
3333
|
// CHARACTER SET, COLLATE, NOT NULL and DEFAULT do not exist on generated (virtual) columns
|
|
3334
3334
|
// Also, postgres only supports the stored generated column type
|
|
3335
3335
|
if (column.generatedType === "STORED" && column.asExpression) {
|
|
3336
|
-
c += " GENERATED ALWAYS AS ("
|
|
3336
|
+
c += " GENERATED ALWAYS AS (".concat(column.asExpression, ") STORED");
|
|
3337
3337
|
}
|
|
3338
3338
|
else {
|
|
3339
3339
|
if (column.charset)
|
|
@@ -3345,7 +3345,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
|
|
|
3345
3345
|
if (column.default !== undefined && column.default !== null)
|
|
3346
3346
|
c += " DEFAULT " + column.default;
|
|
3347
3347
|
if (column.isGenerated && column.generationStrategy === "uuid" && !column.default)
|
|
3348
|
-
c += " DEFAULT "
|
|
3348
|
+
c += " DEFAULT ".concat(this.driver.uuidGenerator);
|
|
3349
3349
|
}
|
|
3350
3350
|
return c;
|
|
3351
3351
|
};
|