Fix field name

Author: owjs3901

crates/vespertide-cli/src/commands/new.rs

@@ -42,8 +42,12 @@ pub fn cmd_new(name: String, format: ModelFormat) -> Result<()> {
 }
 
 fn schema_url_for(format: ModelFormat) -> String {
+    // If not set, default to public raw GitHub schema location.
+    // Users can override via VESP_SCHEMA_BASE_URL.
     let base = std::env::var("VESP_SCHEMA_BASE_URL").ok();
-    let base = base.as_deref().unwrap_or("./schemas");
+    let base = base.as_deref().unwrap_or(
+        "https://raw.githubusercontent.com/dev-five-git/vespertide/refs/heads/main/schemas",
+    );
     let base = base.trim_end_matches('/');
     match format {
         ModelFormat::Json => format!("{}/model.schema.json", base),

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

@@ -7,7 +7,7 @@ use crate::schema::names::ColumnName;
 #[serde(rename_all = "camelCase")]
 pub struct ColumnDef {
     pub name: ColumnName,
-    pub data_type: ColumnType,
+    pub r#type: ColumnType,
     pub nullable: bool,
     pub default: Option<String>,
 }

crates/vespertide-planner/src/lib.rs

@@ -92,11 +92,11 @@ pub fn diff_schemas(from: &[TableDef], to: &[TableDef]) -> Result<MigrationPlan,
             // Modified columns
             for (col, to_def) in &to_cols {
                 if let Some(from_def) = from_cols.get(col) {
-                    if from_def.data_type != to_def.data_type {
+                    if from_def.r#type != to_def.r#type {
                         actions.push(MigrationAction::ModifyColumnType {
                             table: (*name).to_string(),
                             column: (*col).to_string(),
-                            new_type: to_def.data_type.clone(),
+                            new_type: to_def.r#type.clone(),
                         });
                     }
                 }
@@ -259,7 +259,7 @@ pub fn apply_action(
                 .iter_mut()
                 .find(|c| c.name == *column)
                 .ok_or_else(|| PlannerError::ColumnNotFound(table.clone(), column.clone()))?;
-            col.data_type = new_type.clone();
+            col.r#type = new_type.clone();
             Ok(())
         }
         MigrationAction::AddIndex { table, index } => {
@@ -380,7 +380,7 @@ mod tests {
     fn col(name: &str, ty: ColumnType) -> ColumnDef {
         ColumnDef {
             name: name.to_string(),
-            data_type: ty,
+            r#type: ty,
             nullable: true,
             default: None,
         }

crates/vespertide-query/src/lib.rs

@@ -220,7 +220,7 @@ fn create_table_sql(
 
 fn column_def_sql(column: &ColumnDef, binds: &mut Vec<String>) -> String {
     let name = bind(binds, &column.name);
-    let mut parts = vec![format!("{name} {}", column_type_sql(&column.data_type))];
+    let mut parts = vec![format!("{name} {}", column_type_sql(&column.r#type))];
     if !column.nullable {
         parts.push("NOT NULL".into());
     }

examples/app/models/user.json

@@ -1,6 +1,10 @@
 {
-  "$schema": "./schemas/model.schema.json",
-  "columns": [],
+  "$schema": "https://raw.githubusercontent.com/dev-five-git/vespertide/refs/heads/main/schemas/model.schema.json",
+  "columns": [{
+    "name": "aa",
+    "type": "Integer",
+    "nullable": false
+  }],
   "constraints": [],
   "indexes": [],
   "name": "user"

schemas/migration.schema.json

@@ -29,9 +29,6 @@
     "ColumnDef": {
       "type": "object",
       "properties": {
-        "dataType": {
-          "$ref": "#/$defs/ColumnType"
-        },
         "default": {
           "type": [
             "string",
@@ -43,11 +40,14 @@
         },
         "nullable": {
           "type": "boolean"
+        },
+        "type": {
+          "$ref": "#/$defs/ColumnType"
         }
       },
       "required": [
         "name",
-        "dataType",
+        "type",
         "nullable"
       ]
     },

schemas/model.schema.json

@@ -35,9 +35,6 @@
     "ColumnDef": {
       "type": "object",
       "properties": {
-        "dataType": {
-          "$ref": "#/$defs/ColumnType"
-        },
         "default": {
           "type": [
             "string",
@@ -49,11 +46,14 @@
         },
         "nullable": {
           "type": "boolean"
+        },
+        "type": {
+          "$ref": "#/$defs/ColumnType"
         }
       },
       "required": [
         "name",
-        "dataType",
+        "type",
         "nullable"
       ]
     },