Skip to content

Commit 7be64cb

Browse files
committed
Fix inline primary key issue
1 parent 3949623 commit 7be64cb

6 files changed

Lines changed: 13 additions & 34 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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"}

Cargo.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
use schemars::JsonSchema;
22
use serde::{Deserialize, Serialize};
33

4-
use crate::schema::names::ColumnName;
5-
64
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
75
#[serde(rename_all = "snake_case")]
86
pub struct PrimaryKeyDef {
97
#[serde(default)]
108
pub auto_increment: bool,
11-
pub columns: Vec<ColumnName>,
129
}
1310

1411
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,6 @@ mod tests {
14741474
let mut id_col = col("id", ColumnType::Simple(SimpleColumnType::Integer));
14751475
id_col.primary_key = Some(PrimaryKeySyntax::Object(PrimaryKeyDef {
14761476
auto_increment: true,
1477-
columns: vec![], // columns is ignored for inline definition
14781477
}));
14791478

14801479
let table = TableDef {

schemas/migration.schema.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -524,17 +524,8 @@
524524
"auto_increment": {
525525
"type": "boolean",
526526
"default": false
527-
},
528-
"columns": {
529-
"type": "array",
530-
"items": {
531-
"type": "string"
532-
}
533527
}
534-
},
535-
"required": [
536-
"columns"
537-
]
528+
}
538529
},
539530
"PrimaryKeySyntax": {
540531
"anyOf": [

schemas/model.schema.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -295,17 +295,8 @@
295295
"auto_increment": {
296296
"type": "boolean",
297297
"default": false
298-
},
299-
"columns": {
300-
"type": "array",
301-
"items": {
302-
"type": "string"
303-
}
304298
}
305-
},
306-
"required": [
307-
"columns"
308-
]
299+
}
309300
},
310301
"PrimaryKeySyntax": {
311302
"anyOf": [

0 commit comments

Comments
 (0)