Move code

Author: tyt2y3

tests/schema_sync_tests.rs

@@ -10,25 +10,6 @@ use sea_orm::{
     sea_query::{Condition, Expr, Query},
 };
 
-#[cfg(feature = "sqlx-postgres")]
-async fn pg_index_exists(db: &DatabaseConnection, table: &str, index: &str) -> Result<bool, DbErr> {
-    db.query_one(
-        Query::select()
-            .expr(Expr::cust("COUNT(*) > 0"))
-            .from("pg_indexes")
-            .cond_where(
-                Condition::all()
-                    .add(Expr::cust("schemaname = CURRENT_SCHEMA()"))
-                    .add(Expr::col("tablename").eq(table))
-                    .add(Expr::col("indexname").eq(index)),
-            ),
-    )
-    .await?
-    .unwrap()
-    .try_get_by_index(0)
-    .map_err(DbErr::from)
-}
-
 // Scenario 1: table is first synced with a `#[sea_orm(unique)]` column already
 // present. Repeated syncs must not drop the column-level unique constraint.
 mod item_v1 {
@@ -47,110 +28,71 @@ mod item_v1 {
     impl ActiveModelBehavior for ActiveModel {}
 }
 
-// Scenario 3a: initial version — column exists without UNIQUE.
-mod user_v1 {
+// Scenario 2a: initial version of the table — no unique column yet.
+mod product_v1 {
     use sea_orm::entity::prelude::*;
 
     #[sea_orm::model]
     #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-    #[sea_orm(table_name = "sync_user")]
+    #[sea_orm(table_name = "sync_product")]
     pub struct Model {
         #[sea_orm(primary_key)]
         pub id: i32,
-        pub email: String,
     }
 
     impl ActiveModelBehavior for ActiveModel {}
 }
 
-// Scenario 3b: updated version — the existing column is made unique.
-mod user_v2 {
+// Scenario 2b: updated version — a unique column is added.
+mod product_v2 {
     use sea_orm::entity::prelude::*;
 
     #[sea_orm::model]
     #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-    #[sea_orm(table_name = "sync_user")]
+    #[sea_orm(table_name = "sync_product")]
     pub struct Model {
         #[sea_orm(primary_key)]
         pub id: i32,
         #[sea_orm(unique)]
-        pub email: String,
+        pub sku: String,
     }
 
     impl ActiveModelBehavior for ActiveModel {}
 }
 
-// Scenario 2a: initial version of the table — no unique column yet.
-mod product_v1 {
+// Scenario 3a: initial version — column exists without UNIQUE.
+mod user_v1 {
     use sea_orm::entity::prelude::*;
 
     #[sea_orm::model]
     #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-    #[sea_orm(table_name = "sync_product")]
+    #[sea_orm(table_name = "sync_user")]
     pub struct Model {
         #[sea_orm(primary_key)]
         pub id: i32,
+        pub email: String,
     }
 
     impl ActiveModelBehavior for ActiveModel {}
 }
 
-// Scenario 2b: updated version — a unique column is added.
-mod product_v2 {
+// Scenario 3b: updated version — the existing column is made unique.
+mod user_v2 {
     use sea_orm::entity::prelude::*;
 
     #[sea_orm::model]
     #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-    #[sea_orm(table_name = "sync_product")]
+    #[sea_orm(table_name = "sync_user")]
     pub struct Model {
         #[sea_orm(primary_key)]
         pub id: i32,
         #[sea_orm(unique)]
-        pub sku: String,
+        pub email: String,
     }
 
     impl ActiveModelBehavior for ActiveModel {}
 }
 
-/// Scenario 3: an existing column is made unique in a later sync.
-///
-/// When a column that already exists in the DB is annotated with
-/// `#[sea_orm(unique)]`, the sync must create a unique index for it.
-#[sea_orm_macros::test]
-async fn test_sync_make_existing_column_unique() -> Result<(), DbErr> {
-    let ctx = TestContext::new("test_sync_make_existing_column_unique").await;
-    let db = &ctx.db;
-
-    #[cfg(feature = "schema-sync")]
-    {
-        // First sync: creates the table with a plain (non-unique) email column
-        db.get_schema_builder()
-            .register(user_v1::Entity)
-            .sync(db)
-            .await?;
-
-        // Second sync: email is now marked unique — should create the unique index
-        db.get_schema_builder()
-            .register(user_v2::Entity)
-            .sync(db)
-            .await?;
-
-        // Third sync: must not try to drop or re-create the index
-        db.get_schema_builder()
-            .register(user_v2::Entity)
-            .sync(db)
-            .await?;
-
-        #[cfg(feature = "sqlx-postgres")]
-        assert!(
-            pg_index_exists(db, "sync_user", "idx-sync_user-email").await?,
-            "unique index on `sync_user.email` should be created when column is made unique"
-        );
-    }
-
-    Ok(())
-}
-
 /// Regression test for <https://github.com/SeaQL/sea-orm/issues/2970>.
 ///
 /// A table with a `#[sea_orm(unique)]` column is created on the first sync.
@@ -223,3 +165,61 @@ async fn test_sync_add_unique_column_no_drop() -> Result<(), DbErr> {
 
     Ok(())
 }
+
+/// Scenario 3: an existing column is made unique in a later sync.
+///
+/// When a column that already exists in the DB is annotated with
+/// `#[sea_orm(unique)]`, the sync must create a unique index for it.
+#[sea_orm_macros::test]
+async fn test_sync_make_existing_column_unique() -> Result<(), DbErr> {
+    let ctx = TestContext::new("test_sync_make_existing_column_unique").await;
+    let db = &ctx.db;
+
+    #[cfg(feature = "schema-sync")]
+    {
+        // First sync: creates the table with a plain (non-unique) email column
+        db.get_schema_builder()
+            .register(user_v1::Entity)
+            .sync(db)
+            .await?;
+
+        // Second sync: email is now marked unique — should create the unique index
+        db.get_schema_builder()
+            .register(user_v2::Entity)
+            .sync(db)
+            .await?;
+
+        // Third sync: must not try to drop or re-create the index
+        db.get_schema_builder()
+            .register(user_v2::Entity)
+            .sync(db)
+            .await?;
+
+        #[cfg(feature = "sqlx-postgres")]
+        assert!(
+            pg_index_exists(db, "sync_user", "idx-sync_user-email").await?,
+            "unique index on `sync_user.email` should be created when column is made unique"
+        );
+    }
+
+    Ok(())
+}
+
+#[cfg(feature = "sqlx-postgres")]
+async fn pg_index_exists(db: &DatabaseConnection, table: &str, index: &str) -> Result<bool, DbErr> {
+    db.query_one(
+        Query::select()
+            .expr(Expr::cust("COUNT(*) > 0"))
+            .from("pg_indexes")
+            .cond_where(
+                Condition::all()
+                    .add(Expr::cust("schemaname = CURRENT_SCHEMA()"))
+                    .add(Expr::col("tablename").eq(table))
+                    .add(Expr::col("indexname").eq(index)),
+            ),
+    )
+    .await?
+    .unwrap()
+    .try_get_by_index(0)
+    .map_err(DbErr::from)
+}