orchid tests: primaryKey/foreignKey -> columns/references

IlyaSemenov · Jun 24, 2024 · 9de87aa · 9de87aa
1 parent 5d33b01
commit 9de87aa
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 39 deletions.
diff --git a/packages/orchid/docs/pagination.md b/packages/orchid/docs/pagination.md
@@ -60,8 +60,8 @@ class UserTable extends BaseTable {
 
   relations = {
     posts: this.hasMany(() => PostTable, {
-      primaryKey: "id",
-      foreignKey: "author_id",
+      columns: ["id"],
+      references: ["author_id"],
     }),
   }
 }
@@ -78,8 +78,8 @@ class PostTable extends BaseTable {
   relations = {
     author: this.belongsTo(() => UserTable, {
       required: true,
-      primaryKey: "id",
-      foreignKey: "author_id",
+      columns: ["author_id"],
+      references: ["id"],
     }),
   }
 }

diff --git a/packages/orchid/tests/main/filters.test.ts b/packages/orchid/tests/main/filters.test.ts
@@ -14,8 +14,8 @@ class UserTable extends BaseTable {
 
 	relations = {
 		posts: this.hasMany(() => PostTable, {
-			primaryKey: "id",
-			foreignKey: "author_id",
+			columns: ["id"],
+			references: ["author_id"],
 		}),
 	}
 }
@@ -29,14 +29,6 @@ class PostTable extends BaseTable {
 		author_id: t.integer(),
 		is_draft: t.boolean().default(false),
 	}))
-
-	relations = {
-		author: this.belongsTo(() => UserTable, {
-			required: true,
-			primaryKey: "id",
-			foreignKey: "author_id",
-		}),
-	}
 }
 
 const db = await create_db({
@@ -70,7 +62,6 @@ const schema = gql`
 	type Post {
 		id: Int!
 		text: String!
-		author: User!
 	}
 
 	type Query {

diff --git a/packages/orchid/tests/main/relation-pagination.test.ts b/packages/orchid/tests/main/relation-pagination.test.ts
@@ -14,16 +14,16 @@ class UserTable extends BaseTable {
 
 	relations = {
 		posts: this.hasMany(() => PostTable, {
-			primaryKey: "id",
-			foreignKey: "author_id",
+			columns: ["id"],
+			references: ["author_id"],
 		}),
 		comments: this.hasMany(() => CommentTable, {
-			primaryKey: "id",
-			foreignKey: "user_id",
+			columns: ["id"],
+			references: ["user_id"],
 		}),
 		likes: this.hasMany(() => LikeTable, {
-			primaryKey: "id",
-			foreignKey: "user_id",
+			columns: ["id"],
+			references: ["user_id"],
 		}),
 	}
 }
@@ -40,12 +40,12 @@ class PostTable extends BaseTable {
 	relations = {
 		author: this.belongsTo(() => UserTable, {
 			required: true,
-			primaryKey: "id",
-			foreignKey: "author_id",
+			columns: ["author_id"],
+			references: ["id"],
 		}),
 		comments: this.hasMany(() => CommentTable, {
-			primaryKey: "id",
-			foreignKey: "post_id",
+			columns: ["id"],
+			references: ["post_id"],
 		}),
 	}
 }
@@ -63,16 +63,16 @@ class CommentTable extends BaseTable {
 	relations = {
 		user: this.belongsTo(() => UserTable, {
 			required: true,
-			primaryKey: "id",
-			foreignKey: "user_id",
+			columns: ["user_id"],
+			references: ["id"],
 		}),
 		post: this.belongsTo(() => PostTable, {
-			primaryKey: "id",
-			foreignKey: "post_id",
+			columns: ["post_id"],
+			references: ["id"],
 		}),
 		likes: this.hasMany(() => LikeTable, {
-			primaryKey: "id",
-			foreignKey: "comment_id",
+			columns: ["id"],
+			references: ["comment_id"],
 		}),
 	}
 }
@@ -89,12 +89,12 @@ class LikeTable extends BaseTable {
 	relations = {
 		user: this.belongsTo(() => UserTable, {
 			required: true,
-			primaryKey: "id",
-			foreignKey: "user_id",
+			columns: ["user_id"],
+			references: ["id"],
 		}),
 		comment: this.belongsTo(() => CommentTable, {
-			primaryKey: "id",
-			foreignKey: "comment_id",
+			columns: ["comment_id"],
+			references: ["id"],
 		}),
 	}
 }

diff --git a/packages/orchid/tests/main/relations.test.ts b/packages/orchid/tests/main/relations.test.ts
@@ -14,8 +14,8 @@ class UserTable extends BaseTable {
 
 	relations = {
 		posts: this.hasMany(() => PostTable, {
-			primaryKey: "id",
-			foreignKey: "author_id",
+			columns: ["id"],
+			references: ["author_id"],
 		}),
 	}
 }
@@ -32,8 +32,8 @@ class PostTable extends BaseTable {
 	relations = {
 		author: this.belongsTo(() => UserTable, {
 			required: true,
-			primaryKey: "id",
-			foreignKey: "author_id",
+			columns: ["author_id"],
+			references: ["id"],
 		}),
 	}
 }