fix: include APP_NAME in model (#228)

Author: seqre

cot-macros/src/model.rs

@@ -170,6 +170,7 @@ impl ModelBuilder {
                 const COLUMNS: &'static [#orm_ident::Column] = &[
                     #(#fields_as_columns,)*
                 ];
+                const APP_NAME: &'static str = env!("CARGO_PKG_NAME");
                 const TABLE_NAME: #orm_ident::Identifier = #orm_ident::Identifier::new(#table_name);
                 const PRIMARY_KEY_NAME: #orm_ident::Identifier = #orm_ident::Identifier::new(#pk_column_name);
 

cot/src/db.rs

@@ -125,6 +125,9 @@ pub trait Model: Sized + Send + 'static {
     /// The primary key type of the model.
     type PrimaryKey: PrimaryKey;
 
+    /// The name of the app this model is defined in.
+    const APP_NAME: &'static str;
+
     /// The name of the table in the database.
     const TABLE_NAME: Identifier;
 

cot/src/db/migrations.rs

@@ -1503,7 +1503,7 @@ enum MigrationDependencyInner {
     },
     Model {
         app: &'static str,
-        table_name: &'static str,
+        table_name: Identifier,
     },
 }
 
@@ -1528,7 +1528,7 @@ impl MigrationDependency {
     /// creates the model with the given app and table name before the current
     /// migration.
     #[must_use]
-    pub const fn model(app: &'static str, table_name: &'static str) -> Self {
+    pub const fn model(app: &'static str, table_name: Identifier) -> Self {
         Self::new(MigrationDependencyInner::Model { app, table_name })
     }
 }

cot/src/db/migrations/sorter.rs

@@ -5,6 +5,7 @@ use thiserror::Error;
 use crate::db::migrations::{
     DynMigration, MigrationDependency, MigrationDependencyInner, OperationInner,
 };
+use crate::db::Identifier;
 use crate::utils::graph::{apply_permutation, Graph};
 
 #[derive(Debug, Clone, PartialEq, Eq, Error)]
@@ -98,7 +99,7 @@ impl<'a, T: DynMigration> MigrationSorter<'a, T> {
                 if let OperationInner::CreateModel { table_name, .. } = operation.inner {
                     let app_and_model = MigrationLookup::ByAppAndModel {
                         app: migration.app_name(),
-                        table_name: table_name.0,
+                        table_name,
                     };
                     if map.insert(app_and_model, index).is_some() {
                         return Err(MigrationSorterError::DuplicateModel {
@@ -116,8 +117,14 @@ impl<'a, T: DynMigration> MigrationSorter<'a, T> {
 
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
 enum MigrationLookup<'a> {
-    ByAppAndName { app: &'a str, name: &'a str },
-    ByAppAndModel { app: &'a str, table_name: &'a str },
+    ByAppAndName {
+        app: &'a str,
+        name: &'a str,
+    },
+    ByAppAndModel {
+        app: &'a str,
+        table_name: Identifier,
+    },
 }
 
 impl From<&MigrationDependency> for MigrationLookup<'_> {
@@ -179,11 +186,11 @@ mod tests {
         }));
         assert!(lookup.contains_key(&MigrationLookup::ByAppAndModel {
             app: "app1",
-            table_name: "model1"
+            table_name: Identifier::new("model1")
         }));
         assert!(lookup.contains_key(&MigrationLookup::ByAppAndModel {
             app: "app1",
-            table_name: "model2"
+            table_name: Identifier::new("model2")
         }));
     }