update to kurtbuilds_sql

Author: kurtbuilds

Cargo.toml

@@ -8,8 +8,8 @@ futures = "0.3.31"
 indexmap = { version = "2.7.0", features = ["serde"] }
 proc-macro2 = "1.0.92"
 serde = { version = "1.0.217", features = ["derive"] }
-sqlmo = "0.24"
-sqlmo_sqlx = "0.24"
+kurtbuilds_sql = "0.26"
+kurtbuilds_sql_sqlx = "0.26"
 sqlx = "0.8.2"
 sqlx-core = "0.8.2"
 syn = { version = "2.0.94", features = ["full"] }

README.md

@@ -324,7 +324,7 @@ async fn query_builder_example() {
 ### Raw Query
 
 You can fall back to raw queries if the ORM methods don't work for you. You can include handwritten strings, or if
-you want a lower-level query builder, you can use [`sqlmo`](https://github.com/kurtbuilds/sqlmo),
+you want a lower-level query builder, you can use [`sql`](https://github.com/kurtbuilds/sql),
 the underlying engine that powers `ormlite`'s query builder & migration auto-generation.
 
 ```rust

attr/Cargo.toml

@@ -22,7 +22,7 @@ structmeta = "0.3.0"
 convert_case.workspace = true
 anyhow.workspace = true
 ignore = "0.4"
-sqlmo.workspace = true
+kurtbuilds_sql.workspace = true
 tracing = "0.1"
 sqlformat = "=0.2.6"
 

attr/src/ext.rs

@@ -1,11 +1,11 @@
 use syn::{Data, DataStruct, DeriveInput, Field, Fields, FieldsNamed};
 
 pub trait DeriveInputExt {
-    fn fields(&self) -> syn::punctuated::Iter<Field>;
+    fn fields(&self) -> syn::punctuated::Iter<'_, Field>;
 }
 
 impl DeriveInputExt for DeriveInput {
-    fn fields(&self) -> syn::punctuated::Iter<Field> {
+    fn fields(&self) -> syn::punctuated::Iter<'_, Field> {
         let fields = match &self.data {
             Data::Struct(DataStruct { ref fields, .. }) => fields,
             _ => panic!("#[ormlite] can only be used on structs"),

attr/src/metadata/table.rs

@@ -34,7 +34,7 @@ impl TableMeta {
             .map(|c| c.clone())
             .map(|c| c.name.clone());
         if pkey.is_none() {
-            let candidates = sqlmo::util::pkey_column_names(&name);
+            let candidates = sql::util::pkey_column_names(&name);
             if let Some(c) = columns.iter_mut().find(|c| candidates.iter().any(|n| c.ident == n)) {
                 c.has_database_default = true;
                 pkey = Some(c.name.clone());

cli/Cargo.toml

@@ -30,8 +30,8 @@ ormlite.workspace = true
 ormlite-core.workspace = true
 ormlite-attr.workspace = true
 tokio = { version = "1", features = ["full"] }
-sqlmo.workspace = true
-sqlmo_sqlx.workspace = true
+kurtbuilds_sql.workspace = true
+kurtbuilds_sql_sqlx.workspace = true
 syn = "2"
 proc-macro2 = "1"
 url = "2"

cli/src/command/info.rs

@@ -5,8 +5,8 @@ use clap::Parser;
 use ormlite::postgres::PgConnection;
 use ormlite::{Acquire, Connection};
 use ormlite_core::config::{get_var_database_url, get_var_model_folders};
-use sqlmo::Schema;
-use sqlmo_sqlx::FromPostgres;
+use sql::Schema;
+use sql_sqlx::FromPostgres;
 
 #[derive(Parser, Debug)]
 pub struct Info {

cli/src/command/migrate.rs

@@ -5,8 +5,8 @@ use std::path::Path;
 
 use anyhow::{anyhow, Context, Error, Result};
 use clap::Parser;
-use sqlmo::{migrate::Statement, Dialect, Migration, Schema, ToSql};
-use sqlmo_sqlx::FromPostgres;
+use sql::{migrate::Statement, Dialect, Migration, Schema, ToSql};
+use sql_sqlx::FromPostgres;
 use time::macros::format_description;
 use time::OffsetDateTime as DateTime;
 use tokio::runtime::Runtime;
@@ -184,14 +184,20 @@ fn check_reversible_compatibility(reversible: bool, migration_environment: Optio
 #[allow(unused_variables)]
 fn experimental_modifications_to_schema(schema: &mut Schema) -> Result<()> {
     #[allow(unused_imports)]
-    use sqlmo::Type;
+    use sql::Type;
     for table in &mut schema.tables {
         for column in &mut table.columns {
             #[cfg(feature = "experimental-sid")]
             match &column.typ {
                 Type::Other(z) if z == "Sid" => {
                     column.typ = Type::Uuid;
                 }
+                Type::Other(z) if z == "Id" => {
+                    column.typ = Type::Uuid;
+                }
+                Type::Other(z) if z == "Timestamp" => {
+                    column.typ = Type::Timestamp;
+                }
                 _ => {}
             }
         }
@@ -214,7 +220,7 @@ fn autogenerate_migration(
 
     let migration = current.migrate_to(
         desired,
-        &sqlmo::MigrationOptions {
+        &sql::MigrationOptions {
             debug: opts.verbose,
             allow_destructive: false,
         },

cli/src/main.rs

@@ -44,7 +44,7 @@ fn main() -> Result<()> {
             tracing_subscriber::filter::Targets::new()
                 .with_target(env!("CARGO_BIN_NAME"), level)
                 .with_target("ormlite_attr", level)
-                .with_target("sqlmo", level),
+                .with_target("sql", level),
         )
         .init();
     use Command::*;

cli/src/schema.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 use std::path::Path;
-use sqlmo::{Constraint, Schema, Table};
+use sql::{Constraint, Schema, Table};
 use ormlite_attr::{schema_from_filepaths, Ident, InnerType, Type};
 use ormlite_core::schema::FromMeta;
 use anyhow::Result as AnyResult;