Fix test to catch foreign key issue in --diff-schema generation

Author: sudosteve

diesel_cli/tests/generate_migrations/diff_add_table_with_fk/mysql/initial_schema.sql

@@ -1,4 +1,4 @@
 CREATE TABLE `users`(
-	`id` INTEGER NOT NULL PRIMARY KEY,
+	`user_id` INTEGER NOT NULL PRIMARY KEY,
 	`name` TEXT NOT NULL
 );

diesel_cli/tests/generate_migrations/diff_add_table_with_fk/mysql/schema_out.rs/expected.snap

@@ -6,21 +6,21 @@ description: "Test: diff_add_table_with_fk"
 // @generated automatically by Diesel CLI.
 
 diesel::table! {
-    posts (id) {
-        id -> Integer,
+    posts (post_id) {
+        post_id -> Integer,
         title -> Text,
         body -> Nullable<Text>,
-        user_id -> Integer,
+        foreign_key_user_id -> Integer,
     }
 }
 
 diesel::table! {
-    users (id) {
-        id -> Integer,
+    users (user_id) {
+        user_id -> Integer,
         name -> Text,
     }
 }
 
-diesel::joinable!(posts -> users (user_id));
+diesel::joinable!(posts -> users (foreign_key_user_id));
 
 diesel::allow_tables_to_appear_in_same_query!(posts, users,);

diesel_cli/tests/generate_migrations/diff_add_table_with_fk/mysql/up.sql/expected.snap

@@ -6,11 +6,11 @@ description: "Test: diff_add_table_with_fk"
 -- Your SQL goes here
 
 CREATE TABLE `posts`(
-	`id` INTEGER NOT NULL PRIMARY KEY,
+	`post_id` INTEGER NOT NULL PRIMARY KEY,
 	`title` TEXT NOT NULL,
 	`body` TEXT,
-	`user_id` INTEGER NOT NULL,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`)
+	`foreign_key_user_id` INTEGER NOT NULL,
+	FOREIGN KEY (`foreign_key_user_id`) REFERENCES `users`(`user_id`)
 );
 
 

diesel_cli/tests/generate_migrations/diff_add_table_with_fk/postgres/initial_schema.sql

@@ -1,4 +1,4 @@
 CREATE TABLE "users"(
-	"id" INTEGER NOT NULL PRIMARY KEY,
+	"user_id" INTEGER NOT NULL PRIMARY KEY,
 	"name" TEXT NOT NULL
 );

diesel_cli/tests/generate_migrations/diff_add_table_with_fk/postgres/schema_out.rs/expected.snap

@@ -6,21 +6,21 @@ snapshot_kind: text
 // @generated automatically by Diesel CLI.
 
 diesel::table! {
-    posts (id) {
-        id -> Int4,
+    posts (post_id) {
+        post_id -> Int4,
         title -> Text,
         body -> Nullable<Text>,
-        user_id -> Int4,
+        foreign_key_user_id -> Int4,
     }
 }
 
 diesel::table! {
-    users (id) {
-        id -> Int4,
+    users (user_id) {
+        user_id -> Int4,
         name -> Text,
     }
 }
 
-diesel::joinable!(posts -> users (user_id));
+diesel::joinable!(posts -> users (foreign_key_user_id));
 
 diesel::allow_tables_to_appear_in_same_query!(posts, users,);

diesel_cli/tests/generate_migrations/diff_add_table_with_fk/postgres/up.sql/expected.snap

@@ -6,11 +6,11 @@ description: "Test: diff_add_table_with_fk"
 -- Your SQL goes here
 
 CREATE TABLE "posts"(
-	"id" INTEGER NOT NULL PRIMARY KEY,
+	"post_id" INTEGER NOT NULL PRIMARY KEY,
 	"title" TEXT NOT NULL,
 	"body" TEXT,
-	"user_id" INTEGER NOT NULL,
-	FOREIGN KEY ("user_id") REFERENCES "users"("id")
+	"foreign_key_user_id" INTEGER NOT NULL,
+	FOREIGN KEY ("foreign_key_user_id") REFERENCES "users"("user_id")
 );
 
 

diesel_cli/tests/generate_migrations/diff_add_table_with_fk/schema.rs

@@ -1,17 +1,17 @@
 diesel::table! {
-    users {
-        id -> Integer,
+    users(user_id) {
+        user_id -> Integer,
         name -> Text,
     }
 }
 
 diesel::table! {
-    posts {
-        id -> Integer,
+    posts(post_id) {
+        post_id -> Integer,
         title -> Text,
         body -> Nullable<Text>,
-        user_id -> Integer,
+        foreign_key_user_id -> Integer,
     }
 }
 
-diesel::joinable!(posts -> users (user_id));
+diesel::joinable!(posts -> users (foreign_key_user_id));

diesel_cli/tests/generate_migrations/diff_add_table_with_fk/sqlite/initial_schema.sql

@@ -1,4 +1,4 @@
 CREATE TABLE `users`(
-	`id` INTEGER NOT NULL PRIMARY KEY,
+	`user_id` INTEGER NOT NULL PRIMARY KEY,
 	`name` TEXT NOT NULL
 );

diesel_cli/tests/generate_migrations/diff_add_table_with_fk/sqlite/schema_out.rs/expected.snap

@@ -6,21 +6,21 @@ snapshot_kind: text
 // @generated automatically by Diesel CLI.
 
 diesel::table! {
-    posts (id) {
-        id -> Integer,
+    posts (post_id) {
+        post_id -> Integer,
         title -> Text,
         body -> Nullable<Text>,
-        user_id -> Integer,
+        foreign_key_user_id -> Integer,
     }
 }
 
 diesel::table! {
-    users (id) {
-        id -> Integer,
+    users (user_id) {
+        user_id -> Integer,
         name -> Text,
     }
 }
 
-diesel::joinable!(posts -> users (user_id));
+diesel::joinable!(posts -> users (foreign_key_user_id));
 
 diesel::allow_tables_to_appear_in_same_query!(posts, users,);

diesel_cli/tests/generate_migrations/diff_add_table_with_fk/sqlite/up.sql/expected.snap

@@ -6,11 +6,11 @@ description: "Test: diff_add_table_with_fk"
 -- Your SQL goes here
 
 CREATE TABLE `posts`(
-	`id` INTEGER NOT NULL PRIMARY KEY,
+	`post_id` INTEGER NOT NULL PRIMARY KEY,
 	`title` TEXT NOT NULL,
 	`body` TEXT,
-	`user_id` INTEGER NOT NULL,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`)
+	`foreign_key_user_id` INTEGER NOT NULL,
+	FOREIGN KEY (`foreign_key_user_id`) REFERENCES `users`(`user_id`)
 );