diff --git a/.changepacks/changepack_log_3M5qGSbBnjTlPWyIG-eLa.json b/.changepacks/changepack_log_3M5qGSbBnjTlPWyIG-eLa.json new file mode 100644 index 0000000..7601b83 --- /dev/null +++ b/.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"} \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 568e41f..56f7af5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2949,7 +2949,7 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vespertide" -version = "0.1.15" +version = "0.1.16" dependencies = [ "vespertide-core", "vespertide-macro", @@ -2957,7 +2957,7 @@ dependencies = [ [[package]] name = "vespertide-cli" -version = "0.1.15" +version = "0.1.16" dependencies = [ "anyhow", "assert_cmd", @@ -2981,7 +2981,7 @@ dependencies = [ [[package]] name = "vespertide-config" -version = "0.1.15" +version = "0.1.16" dependencies = [ "clap", "serde", @@ -2989,7 +2989,7 @@ dependencies = [ [[package]] name = "vespertide-core" -version = "0.1.15" +version = "0.1.16" dependencies = [ "rstest", "schemars", @@ -3000,7 +3000,7 @@ dependencies = [ [[package]] name = "vespertide-exporter" -version = "0.1.15" +version = "0.1.16" dependencies = [ "insta", "rstest", @@ -3010,7 +3010,7 @@ dependencies = [ [[package]] name = "vespertide-loader" -version = "0.1.15" +version = "0.1.16" dependencies = [ "anyhow", "rstest", @@ -3025,7 +3025,7 @@ dependencies = [ [[package]] name = "vespertide-macro" -version = "0.1.15" +version = "0.1.16" dependencies = [ "proc-macro2", "quote", @@ -3042,11 +3042,11 @@ dependencies = [ [[package]] name = "vespertide-naming" -version = "0.1.15" +version = "0.1.16" [[package]] name = "vespertide-planner" -version = "0.1.15" +version = "0.1.16" dependencies = [ "insta", "rstest", @@ -3057,7 +3057,7 @@ dependencies = [ [[package]] name = "vespertide-query" -version = "0.1.15" +version = "0.1.16" dependencies = [ "insta", "rstest", diff --git a/crates/vespertide-core/src/schema/primary_key.rs b/crates/vespertide-core/src/schema/primary_key.rs index 755302f..f23dad4 100644 --- a/crates/vespertide-core/src/schema/primary_key.rs +++ b/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, } #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)] diff --git a/crates/vespertide-core/src/schema/table.rs b/crates/vespertide-core/src/schema/table.rs index f21ec7d..3e95b53 100644 --- a/crates/vespertide-core/src/schema/table.rs +++ b/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 { diff --git a/schemas/migration.schema.json b/schemas/migration.schema.json index 366fc33..d4f3dc0 100644 --- a/schemas/migration.schema.json +++ b/schemas/migration.schema.json @@ -524,17 +524,8 @@ "auto_increment": { "type": "boolean", "default": false - }, - "columns": { - "type": "array", - "items": { - "type": "string" - } } - }, - "required": [ - "columns" - ] + } }, "PrimaryKeySyntax": { "anyOf": [ diff --git a/schemas/model.schema.json b/schemas/model.schema.json index 7c8de24..ec1f74d 100644 --- a/schemas/model.schema.json +++ b/schemas/model.schema.json @@ -295,17 +295,8 @@ "auto_increment": { "type": "boolean", "default": false - }, - "columns": { - "type": "array", - "items": { - "type": "string" - } } - }, - "required": [ - "columns" - ] + } }, "PrimaryKeySyntax": { "anyOf": [