@contember/schema-migrations 1.3.0-alpha.7 → 1.3.0-beta.1

package/src/modifications/utils/schemaUpdateUtils.ts

@@ -3,10 +3,9 @@ import { SchemaUpdateError } from '../exceptions'
 import { isDefined } from '../../utils/isDefined'
 import { isInverseRelation, isOwningRelation, isRelation, PredicateDefinitionProcessor } from '@contember/schema-utils'
 import { VERSION_ACL_PATCH, VERSION_REMOVE_RELATION_INVERSE_SIDE } from '../ModificationVersions'
-import { resolveIndexName, SchemaWithMeta } from './schemaMeta'
 
 
-export type SchemaUpdater = (args: { schema: SchemaWithMeta }) => SchemaWithMeta
+export type SchemaUpdater = (args: { schema: Schema }) => Schema
 export type ModelUpdater = (args: { schema: Schema; model: Model.Schema }) => Model.Schema
 export type EntityUpdater = (args: { schema: Schema; model: Model.Schema; entity: Model.Entity }) => Model.Entity
 export type FieldUpdater<In extends Model.AnyField, Out extends Model.AnyField> = (args: {
@@ -271,13 +270,13 @@ export const removeField = (entityName: string, fieldName: string, version: numb
 			updateModel(
 				updateEntity(entity.name, ({ entity }) => {
 					const { [field.name]: removed, ...fields } = entity.fields
-					const indexes = Object.entries(entity.indexes).filter(([, index]) => !index.fields.includes(field.name))
-					const unique = Object.entries(entity.unique).filter(([, index]) => !index.fields.includes(field.name))
+					const indexes = entity.indexes.filter(index => !index.fields.includes(field.name))
+					const unique = entity.unique.filter(index => !index.fields.includes(field.name))
 					return {
 						...entity,
 						fields,
-						indexes: Object.fromEntries(indexes),
-						unique: Object.fromEntries(unique),
+						indexes,
+						unique,
 					}
 				}),
 				isRelation(field) && isInverseRelation(field)
@@ -290,14 +289,3 @@ export const removeField = (entityName: string, fieldName: string, version: numb
 		)({ schema })
 	}
 }
-
-export const addTakenIndexName = (indexName: string): SchemaUpdater => ({ schema }) => ({
-	...schema,
-	meta: {
-		...schema.meta,
-		takenIndexNames: {
-			...schema.meta?.takenIndexNames,
-			[resolveIndexName(schema, indexName)]: true,
-		},
-	},
-})

package/src/modifications/utils/stringArrayEquals.ts

@@ -0,0 +1,4 @@
+export const stringArrayEquals = (colA: string[], colB: string[]) => {
+	return colA.length === colB.length
+		&& colA.every((it, index) => it === colB[index])
+}

package/src/tsconfig.json

@@ -6,7 +6,6 @@
 		"downlevelIteration": true
 	},
 	"references": [
-		{ "path": "../../database/src" },
 		{ "path": "../../database-migrations/src" },
 		{ "path": "../../engine-common/src" },
 		{ "path": "../../schema/src" },

package/src/utils/PartialEntity.ts

@@ -2,4 +2,10 @@ import { Model } from '@contember/schema'
 
 type SomePartial<E, K extends keyof E> = Omit<E, K> & Partial<Pick<E, K>>
 
-export type PartialEntity = SomePartial<Model.Entity, 'eventLog' | 'indexes'>
+export type PossibleEntityShapeInMigrations =
+	& Omit<Model.Entity, 'eventLog' | 'indexes' | 'unique'>
+	& {
+		eventLog?: Model.Entity['eventLog']
+		indexes?: (readonly  Model.Index[]) | Readonly<Record<string, Model.Index>>
+		unique: (readonly  Model.UniqueConstraint[]) | Readonly<Record<string, Model.UniqueConstraint>>
+	}

package/tests/cases/integration/convertOneHasManyToManyHasManyRelation.test.ts

@@ -67,7 +67,7 @@ testMigrations('convert one has many to many has many', {
 		"category_id" uuid NOT NULL REFERENCES "category"("id") ON DELETE CASCADE
 	);
 	ALTER TABLE "article_categories"
-		ADD CONSTRAINT "article_categories_pkey" PRIMARY KEY ("article_id", "category_id");
+		ADD PRIMARY KEY ("article_id", "category_id");
 
 	CREATE TRIGGER "log_event" AFTER INSERT OR UPDATE OR DELETE
 	    ON "article_categories" FOR EACH ROW

package/tests/cases/integration/convertOneToManyRelation.test.ts

@@ -24,8 +24,8 @@ testMigrations('convert one has one to many has one relation without inverse sid
 		},
 	],
 	sql: SQL`
-		CREATE INDEX "post_image_id_index" ON "post" ("image_id");
-		ALTER TABLE "post" DROP CONSTRAINT "unique_Post_image_a85d6d";
+		CREATE INDEX ON "post" ("image_id");
+		ALTER TABLE "post" DROP CONSTRAINT "uniq_post_image_id";
 	`,
 })
 
@@ -52,8 +52,8 @@ testMigrations('convert one has one to many has one relation with inverse side',
 		},
 	],
 	sql: SQL`
-		CREATE INDEX "post_image_id_index" ON "post" ("image_id");
-		ALTER TABLE "post" DROP CONSTRAINT "unique_Post_image_a85d6d";
-	`,
+	CREATE INDEX ON "post" ("image_id"); 
+	ALTER TABLE "post" DROP CONSTRAINT "uniq_post_image_id";
+`,
 })
 

package/tests/cases/integration/createAndDropIndex.test.ts

@@ -23,10 +23,10 @@ testMigrations('create index', {
 		{
 			modification: 'createIndex',
 			entityName: 'Article',
-			index: { name: 'idx_Article_title_2dc66a', fields: ['title'] },
+			index: { fields: ['title'] },
 		},
 	],
-	sql: SQL`CREATE INDEX "idx_Article_title_2dc66a" ON "article" ("title");`,
+	sql: SQL`CREATE INDEX ON "article" ("title");`,
 })
 
 
@@ -37,8 +37,8 @@ testMigrations('drop index', {
 		{
 			modification: 'removeIndex',
 			entityName: 'Article',
-			indexName: 'idx_Article_title_2dc66a',
+			fields: ['title'],
 		},
 	],
-	sql: SQL`DROP INDEX "idx_Article_title_2dc66a";`,
+	sql: SQL`DROP INDEX "idx_article_title";`,
 })

package/tests/cases/integration/createColumn.test.ts

@@ -32,7 +32,6 @@ testMigrations('create a column with default value', {
 	],
 	sql: SQL`ALTER TABLE "author" ADD "name" text;
 UPDATE "author" SET "name" = $pga$unnamed author$pga$;
-SET CONSTRAINTS ALL IMMEDIATE; SET CONSTRAINTS ALL DEFERRED;
 ALTER TABLE "author" ALTER "name" SET NOT NULL;`,
 })
 
@@ -65,6 +64,5 @@ testMigrations('create a column with copy value', {
 	noDiff: true,
 	sql: SQL`ALTER TABLE "author" ADD "name" text;
 UPDATE "author" SET "name" = "email"::text;
-SET CONSTRAINTS ALL IMMEDIATE; SET CONSTRAINTS ALL DEFERRED;
 ALTER TABLE "author" ALTER "name" SET NOT NULL;`,
 })

package/tests/cases/integration/createEntity.test.ts

@@ -31,11 +31,11 @@ testMigrations('create a table (no relations, unique on column)', {
 				primary: 'id',
 				primaryColumn: 'id',
 				tableName: 'author',
-				unique: {},
+				unique: [],
 				eventLog: {
 					enabled: true,
 				},
-				indexes: {},
+				indexes: [],
 			},
 		},
 		{
@@ -74,10 +74,7 @@ testMigrations('create a table (no relations, unique on column)', {
 		{
 			modification: 'createUniqueConstraint',
 			entityName: 'Author',
-			unique: {
-				name: 'unique_Author_email_a3e587',
-				fields: ['email'],
-			},
+			unique: { fields: ['email'] },
 		},
 	],
 	sql: SQL`CREATE TABLE "author" (
@@ -101,7 +98,7 @@ testMigrations('create a table (no relations, unique on column)', {
 	ALTER TABLE "author"
 		ADD "registered_at" date;
 	ALTER TABLE "author"
-		ADD CONSTRAINT "unique_Author_email_a3e587" UNIQUE ("email");`,
+		ADD UNIQUE ("email");`,
 })
 
 namespace ViewEntityUpdatedSchema {
@@ -137,12 +134,12 @@ testMigrations('create a view', {
 				primary: 'id',
 				primaryColumn: 'id',
 				tableName: 'author',
-				unique: {},
+				unique: [],
 				view: { sql: "SELECT null as id, 'John' AS name" },
 				eventLog: {
 					enabled: true,
 				},
-				indexes: {},
+				indexes: [],
 			},
 		},
 	],

package/tests/cases/integration/createManyHasMany.test.ts

@@ -30,11 +30,11 @@ testMigrations('create many has many relation (post with categories)', {
 				primary: 'id',
 				primaryColumn: 'id',
 				tableName: 'category',
-				unique: {},
+				unique: [],
 				eventLog: {
 					enabled: true,
 				},
-				indexes: {},
+				indexes: [],
 			},
 		},
 		{
@@ -93,7 +93,7 @@ testMigrations('create many has many relation (post with categories)', {
 		"category_id" uuid NOT NULL REFERENCES "category"("id") ON DELETE CASCADE
 	);
 	ALTER TABLE "post_categories"
-		ADD CONSTRAINT "post_categories_pkey" PRIMARY KEY ("post_id", "category_id");
+		ADD PRIMARY KEY ("post_id", "category_id");
 	CREATE TRIGGER "log_event"
 		AFTER INSERT OR UPDATE OR DELETE
 		ON "post_categories"

package/tests/cases/integration/createManyHasOne.test.ts

@@ -32,11 +32,11 @@ testMigrations('create many has one relation (post with author)', {
 				primary: 'id',
 				primaryColumn: 'id',
 				tableName: 'post',
-				unique: {},
+				unique: [],
 				eventLog: {
 					enabled: true,
 				},
-				indexes: {},
+				indexes: [],
 			},
 		},
 		{
@@ -84,6 +84,6 @@ testMigrations('create many has one relation (post with author)', {
 	ALTER TABLE "post"
 		ADD "author_id" uuid;
 	ALTER TABLE "post"
-		ADD CONSTRAINT "fk_post_author_id_87ef9a" FOREIGN KEY ("author_id") REFERENCES "author"("id") ON DELETE CASCADE DEFERRABLE INITIALLY IMMEDIATE;
-	CREATE INDEX "post_author_id_index" ON "post" ("author_id");`,
+		ADD FOREIGN KEY ("author_id") REFERENCES "author"("id") ON DELETE CASCADE DEFERRABLE INITIALLY IMMEDIATE;
+	CREATE INDEX ON "post" ("author_id");`,
 })

package/tests/cases/integration/createOneHasMany.test.ts

@@ -33,11 +33,11 @@ testMigrations('create one has many relation (post with locales)', {
 				primary: 'id',
 				primaryColumn: 'id',
 				tableName: 'post_locale',
-				unique: {},
+				unique: [],
 				eventLog: {
 					enabled: true,
 				},
-				indexes: {},
+				indexes: [],
 			},
 		},
 		{
@@ -92,10 +92,7 @@ testMigrations('create one has many relation (post with locales)', {
 		{
 			modification: 'createUniqueConstraint',
 			entityName: 'PostLocale',
-			unique: {
-				name: 'unique_PostLocale_post_locale_5759e8',
-				fields: ['post', 'locale'],
-			},
+			unique: { fields: ['post', 'locale'] },
 		},
 	],
 	sql: SQL`CREATE TABLE "post_locale" (
@@ -119,8 +116,8 @@ testMigrations('create one has many relation (post with locales)', {
 	ALTER TABLE "post_locale"
 		ADD "post_id" uuid NOT NULL;
 	ALTER TABLE "post_locale"
-		ADD CONSTRAINT "fk_post_locale_post_id_f3d2e5" FOREIGN KEY ("post_id") REFERENCES "post"("id") ON DELETE NO ACTION DEFERRABLE INITIALLY IMMEDIATE;
-	CREATE INDEX "post_locale_post_id_index" ON "post_locale" ("post_id");
+		ADD FOREIGN KEY ("post_id") REFERENCES "post"("id") ON DELETE NO ACTION DEFERRABLE INITIALLY IMMEDIATE;
+	CREATE INDEX ON "post_locale" ("post_id");
 	ALTER TABLE "post_locale"
-		ADD CONSTRAINT "unique_PostLocale_post_locale_5759e8" UNIQUE ("post_id", "locale");`,
+		ADD UNIQUE ("post_id", "locale");`,
 })

package/tests/cases/integration/createOneHasOne.test.ts

@@ -30,11 +30,11 @@ testMigrations('create one has one relation (site with settings)', {
 				primary: 'id',
 				primaryColumn: 'id',
 				tableName: 'site',
-				unique: {},
+				unique: [],
 				eventLog: {
 					enabled: true,
 				},
-				indexes: {},
+				indexes: [],
 			},
 		},
 		{
@@ -53,11 +53,11 @@ testMigrations('create one has one relation (site with settings)', {
 				primary: 'id',
 				primaryColumn: 'id',
 				tableName: 'site_setting',
-				unique: {},
+				unique: [],
 				eventLog: {
 					enabled: true,
 				},
-				indexes: {},
+				indexes: [],
 			},
 		},
 		{
@@ -140,8 +140,8 @@ testMigrations('create one has one relation (site with settings)', {
 	ALTER TABLE "site"
 		ADD "setting_id" uuid;
 	ALTER TABLE "site"
-		ADD CONSTRAINT "fk_site_setting_id_6a4aa6" FOREIGN KEY ("setting_id") REFERENCES "site_setting"("id") ON DELETE NO ACTION DEFERRABLE INITIALLY IMMEDIATE;
+		ADD FOREIGN KEY ("setting_id") REFERENCES "site_setting"("id") ON DELETE NO ACTION DEFERRABLE INITIALLY IMMEDIATE;
 	ALTER TABLE "site"
-		ADD CONSTRAINT "unique_Site_setting_8653a0" UNIQUE ("setting_id");
+		ADD UNIQUE ("setting_id");
 		`,
 })

package/tests/cases/integration/createRelationInverseSide.test.ts

@@ -56,5 +56,5 @@ testMigrations('create inverse side relation together with changing onDelete beh
 			},
 		},
 	],
-	sql: SQL`ALTER TABLE "post_locale" DROP CONSTRAINT "fk_post_locale_post_id_f3d2e5"; ALTER TABLE "post_locale" ADD CONSTRAINT "fk_post_locale_post_id_f3d2e5" FOREIGN KEY ("post_id") REFERENCES "post"("id") ON DELETE NO ACTION DEFERRABLE INITIALLY IMMEDIATE;`,
+	sql: SQL`ALTER TABLE "post_locale" DROP CONSTRAINT "fk_post_locale_post_id_post_id"; ALTER TABLE "post_locale" ADD FOREIGN KEY ("post_id") REFERENCES "post"("id") ON DELETE NO ACTION DEFERRABLE INITIALLY IMMEDIATE;`,
 })

package/tests/cases/integration/createView.test.ts

@@ -33,7 +33,7 @@ testMigrations('create view', {
 				name: 'AuthorStats',
 				primary: 'id',
 				primaryColumn: 'id',
-				unique: {},
+				unique: [],
 				fields: {
 					id: {
 						name: 'id',
@@ -68,7 +68,7 @@ testMigrations('create view', {
 				eventLog: {
 					enabled: true,
 				},
-				indexes: {},
+				indexes: [],
 			},
 		},
 		{
@@ -129,8 +129,8 @@ testMigrations('create a relation and a view', {
 			entity: { name: 'ArticleStats',
 				primary: 'id',
 				primaryColumn: 'id',
-				unique: {},
-				indexes: {},
+				unique: [],
+				indexes: [],
 				fields: { id: { name: 'id', columnName: 'id', nullable: false, type: 'Uuid', columnType: 'uuid' },
 					article: { name: 'article', inversedBy: 'stats', nullable: true, type: 'OneHasOne', target: 'Article', joiningColumn: { columnName: 'article_id', onDelete: 'restrict' } },
 					visitCount: { name: 'visitCount', columnName: 'visit_count', nullable: true, type: 'Integer', columnType: 'integer' } },
@@ -151,8 +151,8 @@ testMigrations('create a relation and a view', {
 		},
 	],
 	sql: SQL`ALTER TABLE "article" ADD "category_id" uuid; 
-ALTER TABLE "article" ADD CONSTRAINT "fk_article_category_id_703b8b" FOREIGN KEY ("category_id") REFERENCES "category"("id") ON DELETE NO ACTION DEFERRABLE INITIALLY IMMEDIATE; 
-CREATE INDEX "article_category_id_index" ON "article" ("category_id"); 
+ALTER TABLE "article" ADD FOREIGN KEY ("category_id") REFERENCES "category"("id") ON DELETE NO ACTION DEFERRABLE INITIALLY IMMEDIATE; 
+CREATE INDEX ON "article" ("category_id"); 
 CREATE VIEW "article_stats" AS SELECT 1;`,
 })
 

package/tests/cases/integration/removeField.test.ts

@@ -47,8 +47,8 @@ testMigrations('remove relation (one has many)', {
 		.buildSchema(),
 	diff: [
 		{
-			constraintName: 'unique_PostLocale_post_locale_5759e8',
 			entityName: 'PostLocale',
+			fields: ['post', 'locale'],
 			modification: 'removeUniqueConstraint',
 		},
 		{
@@ -57,7 +57,7 @@ testMigrations('remove relation (one has many)', {
 			fieldName: 'post',
 		},
 	],
-	sql: SQL`ALTER TABLE "post_locale" DROP CONSTRAINT "unique_PostLocale_post_locale_5759e8";
+	sql: SQL`ALTER TABLE "post_locale" DROP CONSTRAINT "uniq_post_locale_post_id_locale";
 						ALTER TABLE "post_locale" DROP "post_id";`,
 })
 
@@ -173,15 +173,15 @@ testMigrations('test drop index / unique when removing a field', {
 	}, {
 		modification: 'createUniqueConstraint',
 		entityName: 'Article',
-		unique: { name: 'unique_Article_title_author_7157ea', fields: ['title', 'author'] },
+		unique: { fields: ['title', 'author'] },
 	}, {
 		modification: 'createIndex',
 		entityName: 'Article',
-		index: { name: 'idx_Article_title_author_7157ea', fields: ['title', 'author'] },
+		index: { fields: ['title', 'author'] },
 	}],
 	sql: SQL`ALTER TABLE "article" DROP "author_id";
 ALTER TABLE "article" ADD "author" text;
-ALTER TABLE "article" ADD CONSTRAINT "unique_Article_title_author_7157ea" UNIQUE ("title", "author");
-CREATE INDEX "idx_Article_title_author_7157ea" ON "article" ("title", "author");`,
+ALTER TABLE "article" ADD UNIQUE ("title", "author");
+CREATE INDEX ON "article" ("title", "author");`,
 })
 

package/tests/cases/integration/updateColumnDefinition.test.ts

@@ -124,8 +124,8 @@ testMigrations('recreate view dependent on entity after changing column type', {
 			name: 'AuthorMetaX',
 			primary: 'id',
 			primaryColumn: 'id',
-			unique: {},
-			indexes: {},
+			unique: [],
+			indexes: [],
 			fields: {
 				id: {
 					name: 'id',
@@ -145,8 +145,8 @@ testMigrations('recreate view dependent on entity after changing column type', {
 			name: 'AuthorMetaY',
 			primary: 'id',
 			primaryColumn: 'id',
-			unique: {},
-			indexes: {},
+			unique: [],
+			indexes: [],
 			fields: {
 				id: {
 					name: 'id',
@@ -168,3 +168,35 @@ ALTER TABLE "author"
 CREATE VIEW "author_meta_x" AS SELECT * FROM author;
 CREATE VIEW "author_meta_y" AS SELECT * FROM author_meta_x;`,
 })
+
+
+namespace NotNullOrig {
+	export class Author {
+		name = def.stringColumn()
+	}
+}
+namespace NotNullUpdated {
+	export class Author {
+		name = def.stringColumn().notNull()
+	}
+}
+testMigrations('set not null and fill', {
+	originalSchema: createSchema(NotNullOrig).model,
+	updatedSchema: createSchema(NotNullUpdated).model,
+	noDiff: true,
+	diff: [
+		updateColumnDefinitionModification.createModification({
+			entityName: 'Author',
+			fieldName: 'name',
+			definition: {
+				type: Model.ColumnType.String,
+				columnType: 'text',
+				nullable: false,
+			},
+			fillValue: 'unnamed',
+		}),
+	],
+	sql: SQL`
+UPDATE "author" SET "name" = $pga$unnamed$pga$ WHERE "name" IS NULL; 
+ALTER TABLE "author" ALTER "name" SET NOT NULL;`,
+})

package/tests/cases/integration/updateEntityName.test.ts

@@ -43,24 +43,6 @@ testMigrations('rename entity and table', {
 	noDiff: true,
 })
 
-testMigrations('rename entity with a constraint', {
-	originalSchema: new SchemaBuilder()
-		.entity('Author', e => e.column('slug', c => c.type(Model.ColumnType.String).unique()))
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('User', e => e.tableName('author').column('slug', c => c.type(Model.ColumnType.String).unique()))
-		.buildSchema(),
-	diff: [
-		{
-			modification: 'updateEntityName',
-			entityName: 'Author',
-			newEntityName: 'User',
-		},
-	],
-	sql: SQL`ALTER TABLE "author"
-			RENAME CONSTRAINT "unique_Author_slug_a645b0" TO "unique_User_slug_d61dea";`,
-	noDiff: true,
-})
 
 testMigrations('rename entity with one-has-one (constraint)', {
 	originalSchema: new SchemaBuilder()
@@ -78,8 +60,7 @@ testMigrations('rename entity with one-has-one (constraint)', {
 			newEntityName: 'User',
 		},
 	],
-	sql: SQL`ALTER TABLE "author"
-			RENAME CONSTRAINT "unique_Author_content_b64856" TO "unique_User_content_43c77f";`,
+	sql: SQL``,
 	noDiff: true,
 })
 

package/tests/cases/integration/updateFieldName.test.ts

@@ -43,25 +43,6 @@ testMigrations('rename a field with column', {
 })
 
 
-testMigrations('rename a field with a constraint', {
-	originalSchema: new SchemaBuilder()
-		.entity('Author', e => e.column('slug', c => c.type(Model.ColumnType.String).unique()))
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Author', e => e.column('identifier', c => c.type(Model.ColumnType.String).columnName('slug').unique()))
-		.buildSchema(),
-	diff: [
-		{
-			modification: 'updateFieldName',
-			entityName: 'Author',
-			fieldName: 'slug',
-			newFieldName: 'identifier',
-		},
-	],
-	sql: SQL`ALTER TABLE "author"
-			RENAME CONSTRAINT "unique_Author_slug_a645b0" TO "unique_Author_identifier_4eb9f2";`,
-	noDiff: true,
-})
 
 testMigrations('rename a field with one-has-one', {
 	originalSchema: new SchemaBuilder()
@@ -80,8 +61,7 @@ testMigrations('rename a field with one-has-one', {
 			newFieldName: 'description',
 		},
 	],
-	sql: SQL`ALTER TABLE "author"
-        RENAME CONSTRAINT "unique_Author_content_b64856" TO "unique_Author_description_00f1ef";`,
+	sql: SQL``,
 	noDiff: true,
 })
 

package/tests/cases/integration/updateRelationOnDelete.test.ts

@@ -26,6 +26,6 @@ testMigrations('update relation ondelete to cascade', {
 			onDelete: Model.OnDelete.cascade,
 		},
 	],
-	sql: SQL`ALTER TABLE "post" DROP CONSTRAINT "fk_post_category_id_820029";
-ALTER TABLE "post" ADD CONSTRAINT "fk_post_category_id_820029" FOREIGN KEY ("category_id") REFERENCES "category"("id") ON DELETE NO ACTION DEFERRABLE INITIALLY IMMEDIATE;`,
+	sql: SQL`ALTER TABLE "post" DROP CONSTRAINT "fk_post_category_id_category_id"; 
+ALTER TABLE "post" ADD FOREIGN KEY ("category_id") REFERENCES "category"("id") ON DELETE NO ACTION DEFERRABLE INITIALLY IMMEDIATE;`,
 })