Merge pull request #38 from dev-five-git/inline-primary

Fix inline primary key issue

Author: owjs3901

.changepacks/changepack_log_3M5qGSbBnjTlPWyIG-eLa.json

@@ -0,0 +1 @@
+{"changes":{"crates/vespertide-exporter/Cargo.toml":"Patch","crates/vespertide-config/Cargo.toml":"Patch","crates/vespertide-macro/Cargo.toml":"Patch","crates/vespertide-core/Cargo.toml":"Patch","crates/vespertide-planner/Cargo.toml":"Patch","crates/vespertide-query/Cargo.toml":"Patch","crates/vespertide-loader/Cargo.toml":"Patch","crates/vespertide-naming/Cargo.toml":"Patch","crates/vespertide-cli/Cargo.toml":"Patch","crates/vespertide/Cargo.toml":"Patch"},"note":"Fix inline primary key issue","date":"2025-12-24T05:55:32.660669100Z"}

crates/vespertide-core/src/schema/primary_key.rs

@@ -1,14 +1,11 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use crate::schema::names::ColumnName;
-
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub struct PrimaryKeyDef {
     #[serde(default)]
     pub auto_increment: bool,
-    pub columns: Vec<ColumnName>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]

crates/vespertide-core/src/schema/table.rs

@@ -1474,7 +1474,6 @@ mod tests {
         let mut id_col = col("id", ColumnType::Simple(SimpleColumnType::Integer));
         id_col.primary_key = Some(PrimaryKeySyntax::Object(PrimaryKeyDef {
             auto_increment: true,
-            columns: vec![], // columns is ignored for inline definition
         }));
 
         let table = TableDef {

schemas/migration.schema.json

@@ -528,17 +528,8 @@
         "auto_increment": {
           "type": "boolean",
           "default": false
-        },
-        "columns": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
         }
-      },
-      "required": [
-        "columns"
-      ]
+      }
     },
     "PrimaryKeySyntax": {
       "anyOf": [

schemas/model.schema.json

@@ -299,17 +299,8 @@
         "auto_increment": {
           "type": "boolean",
           "default": false
-        },
-        "columns": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
         }
-      },
-      "required": [
-        "columns"
-      ]
+      }
     },
     "PrimaryKeySyntax": {
       "anyOf": [