From 3dfcca179813866a91d534dfbe0cfd3d2fc53429 Mon Sep 17 00:00:00 2001 From: Stefan Steiner Date: Thu, 4 Jun 2026 00:49:39 -0700 Subject: [PATCH 1/2] fix: upgrade sea-query from 0.32 to 1.0 --- sea-query-hyperdb/Cargo.toml | 2 +- sea-query-hyperdb/examples/basic_usage.rs | 2 +- sea-query-hyperdb/src/lib.rs | 59 +++++++++++++++-------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/sea-query-hyperdb/Cargo.toml b/sea-query-hyperdb/Cargo.toml index 9fe450b..1275902 100644 --- a/sea-query-hyperdb/Cargo.toml +++ b/sea-query-hyperdb/Cargo.toml @@ -15,4 +15,4 @@ categories = ["database"] workspace = true [dependencies] -sea-query = "0.32" +sea-query = "1.0" diff --git a/sea-query-hyperdb/examples/basic_usage.rs b/sea-query-hyperdb/examples/basic_usage.rs index 338c045..e4a767a 100644 --- a/sea-query-hyperdb/examples/basic_usage.rs +++ b/sea-query-hyperdb/examples/basic_usage.rs @@ -5,7 +5,7 @@ //! //! Run with: `cargo run -p sea-query-hyper --example basic_usage` -use sea_query::{ColumnDef, Expr, Iden, Query, Table}; +use sea_query::{ColumnDef, Expr, ExprTrait, Iden, Query, Table}; use sea_query_hyperdb::HyperQueryBuilder; #[derive(Iden)] diff --git a/sea-query-hyperdb/src/lib.rs b/sea-query-hyperdb/src/lib.rs index e72ad95..0d6ecf7 100644 --- a/sea-query-hyperdb/src/lib.rs +++ b/sea-query-hyperdb/src/lib.rs @@ -18,7 +18,7 @@ //! backend is accepted: //! //! ```rust -//! use sea_query::{Query, Expr, Iden, PostgresQueryBuilder}; +//! use sea_query::{Query, Expr, ExprTrait, Iden, PostgresQueryBuilder}; //! use sea_query_hyperdb::HyperQueryBuilder; //! //! #[derive(Iden)] @@ -74,9 +74,10 @@ use sea_query::backend::{ PrecedenceDecider, QueryBuilder, QuotedBuilder, SchemaBuilder, TableBuilder, TableRefBuilder, }; use sea_query::{ - BinOper, ColumnDef, ColumnType, ForeignKeyCreateStatement, ForeignKeyDropStatement, - IndexCreateStatement, IndexDropStatement, Oper, PostgresQueryBuilder, Quote, SimpleExpr, - SubQueryStatement, TableAlterStatement, TableRef, TableRenameStatement, Value, + BinOper, ColumnDef, ColumnType, Expr, ExplainStatement, ForeignKeyCreateStatement, + ForeignKeyDropStatement, IndexCreateStatement, IndexDropStatement, Oper, PostgresQueryBuilder, + Quote, SelectInto, SubQueryStatement, TableAlterStatement, TableRef, TableRenameStatement, + Value, }; /// HyperDB-specific SQL dialect backend for sea-query. @@ -104,7 +105,7 @@ use sea_query::{ /// # Examples /// /// ```rust -/// use sea_query::{Query, Expr, Iden}; +/// use sea_query::{Query, Expr, ExprTrait, Iden}; /// use sea_query_hyperdb::HyperQueryBuilder; /// /// #[derive(Iden)] @@ -144,7 +145,7 @@ impl OperLeftAssocDecider for HyperQueryBuilder { impl PrecedenceDecider for HyperQueryBuilder { fn inner_expr_well_known_greater_precedence( &self, - inner: &SimpleExpr, + inner: &Expr, outer_oper: &Oper, ) -> bool { PostgresQueryBuilder.inner_expr_well_known_greater_precedence(inner, outer_oper) @@ -155,29 +156,45 @@ impl QueryBuilder for HyperQueryBuilder { fn prepare_query_statement( &self, query: &SubQueryStatement, - sql: &mut dyn sea_query::SqlWriter, + sql: &mut impl sea_query::SqlWriter, ) { PostgresQueryBuilder.prepare_query_statement(query, sql); } - fn prepare_value(&self, value: &Value, sql: &mut dyn sea_query::SqlWriter) { + fn prepare_select_into(&self, into_table: &SelectInto, sql: &mut impl sea_query::SqlWriter) { + PostgresQueryBuilder.prepare_select_into(into_table, sql); + } + + fn prepare_explain_statement( + &self, + explain: &ExplainStatement, + sql: &mut impl sea_query::SqlWriter, + ) { + PostgresQueryBuilder.prepare_explain_statement(explain, sql); + } + + fn prepare_value(&self, value: Value, sql: &mut impl sea_query::SqlWriter) { PostgresQueryBuilder.prepare_value(value, sql); } - fn placeholder(&self) -> (&str, bool) { + fn placeholder(&self) -> (&'static str, bool) { PostgresQueryBuilder.placeholder() } } impl ForeignKeyBuilder for HyperQueryBuilder { - fn prepare_table_ref_fk_stmt(&self, table_ref: &TableRef, sql: &mut dyn sea_query::SqlWriter) { + fn prepare_table_ref_fk_stmt( + &self, + table_ref: &TableRef, + sql: &mut impl sea_query::SqlWriter, + ) { PostgresQueryBuilder.prepare_table_ref_fk_stmt(table_ref, sql); } fn prepare_foreign_key_create_statement_internal( &self, create: &ForeignKeyCreateStatement, - sql: &mut dyn sea_query::SqlWriter, + sql: &mut impl sea_query::SqlWriter, mode: sea_query::backend::Mode, ) { PostgresQueryBuilder.prepare_foreign_key_create_statement_internal(create, sql, mode); @@ -186,7 +203,7 @@ impl ForeignKeyBuilder for HyperQueryBuilder { fn prepare_foreign_key_drop_statement_internal( &self, drop: &ForeignKeyDropStatement, - sql: &mut dyn sea_query::SqlWriter, + sql: &mut impl sea_query::SqlWriter, mode: sea_query::backend::Mode, ) { PostgresQueryBuilder.prepare_foreign_key_drop_statement_internal(drop, sql, mode); @@ -197,7 +214,7 @@ impl IndexBuilder for HyperQueryBuilder { fn prepare_index_create_statement( &self, create: &IndexCreateStatement, - sql: &mut dyn sea_query::SqlWriter, + sql: &mut impl sea_query::SqlWriter, ) { PostgresQueryBuilder.prepare_index_create_statement(create, sql); } @@ -205,7 +222,7 @@ impl IndexBuilder for HyperQueryBuilder { fn prepare_table_ref_index_stmt( &self, table_ref: &TableRef, - sql: &mut dyn sea_query::SqlWriter, + sql: &mut impl sea_query::SqlWriter, ) { PostgresQueryBuilder.prepare_table_ref_index_stmt(table_ref, sql); } @@ -213,7 +230,7 @@ impl IndexBuilder for HyperQueryBuilder { fn prepare_index_drop_statement( &self, drop: &IndexDropStatement, - sql: &mut dyn sea_query::SqlWriter, + sql: &mut impl sea_query::SqlWriter, ) { PostgresQueryBuilder.prepare_index_drop_statement(drop, sql); } @@ -221,18 +238,18 @@ impl IndexBuilder for HyperQueryBuilder { fn prepare_index_prefix( &self, create: &IndexCreateStatement, - sql: &mut dyn sea_query::SqlWriter, + sql: &mut impl sea_query::SqlWriter, ) { PostgresQueryBuilder.prepare_index_prefix(create, sql); } } impl TableBuilder for HyperQueryBuilder { - fn prepare_column_def(&self, column_def: &ColumnDef, sql: &mut dyn sea_query::SqlWriter) { + fn prepare_column_def(&self, column_def: &ColumnDef, sql: &mut impl sea_query::SqlWriter) { PostgresQueryBuilder.prepare_column_def(column_def, sql); } - fn prepare_column_type(&self, column_type: &ColumnType, sql: &mut dyn sea_query::SqlWriter) { + fn prepare_column_type(&self, column_type: &ColumnType, sql: &mut impl sea_query::SqlWriter) { PostgresQueryBuilder.prepare_column_type(column_type, sql); } @@ -243,7 +260,7 @@ impl TableBuilder for HyperQueryBuilder { fn prepare_table_alter_statement( &self, alter: &TableAlterStatement, - sql: &mut dyn sea_query::SqlWriter, + sql: &mut impl sea_query::SqlWriter, ) { PostgresQueryBuilder.prepare_table_alter_statement(alter, sql); } @@ -251,7 +268,7 @@ impl TableBuilder for HyperQueryBuilder { fn prepare_table_rename_statement( &self, rename: &TableRenameStatement, - sql: &mut dyn sea_query::SqlWriter, + sql: &mut impl sea_query::SqlWriter, ) { PostgresQueryBuilder.prepare_table_rename_statement(rename, sql); } @@ -264,7 +281,7 @@ impl GenericBuilder for HyperQueryBuilder {} #[cfg(test)] mod tests { use super::*; - use sea_query::{Expr, Iden, Query}; + use sea_query::{ExprTrait, Iden, Query}; #[derive(Iden)] enum Users { From 92ba1955c9d1cd6dec8f68ec73a9747e1567d7e3 Mon Sep 17 00:00:00 2001 From: Stefan Steiner Date: Thu, 4 Jun 2026 00:50:53 -0700 Subject: [PATCH 2/2] chore: update Cargo.lock for sea-query 1.0 upgrade --- Cargo.lock | 41 +++++++++++++----------------------- sea-query-hyperdb/src/lib.rs | 14 +++--------- 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6ecab57..16a873a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,7 +76,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -87,7 +87,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1098,7 +1098,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1239,7 +1239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2174,17 +2174,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "inherent" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c727f80bfa4a6c6e2508d2f05b6f4bfce242030bd88ed15ae5331c5b5d30fba7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "inotify" version = "0.11.1" @@ -2694,7 +2683,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3655,7 +3644,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3714,7 +3703,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3805,19 +3794,19 @@ checksum = "c1257cd4248b4132760d6524d6dda4e053bc648c9070b960929bf50cfb1e7add" [[package]] name = "sea-query" -version = "0.32.7" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5d1c518eaf5eda38e5773f902b26ab6d5e9e9e2bb2349ca6c64cf96f80448c" +checksum = "8d190cfb3bcceb8a8d7d04dee5a0c77f60c7627979cdcb47fdcb8934f009badf" dependencies = [ - "inherent", + "itoa", "sea-query-derive", ] [[package]] name = "sea-query-derive" -version = "0.4.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae0cbad6ab996955664982739354128c58d16e126114fe88c2a493642502aab" +checksum = "a0b0f466921cdd3cf4b89d5c3ac2173dba89a873ab395b123a645de181ec7537" dependencies = [ "darling 0.20.11", "heck 0.4.1", @@ -4069,7 +4058,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4184,7 +4173,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4932,7 +4921,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/sea-query-hyperdb/src/lib.rs b/sea-query-hyperdb/src/lib.rs index 0d6ecf7..1f6e63b 100644 --- a/sea-query-hyperdb/src/lib.rs +++ b/sea-query-hyperdb/src/lib.rs @@ -74,7 +74,7 @@ use sea_query::backend::{ PrecedenceDecider, QueryBuilder, QuotedBuilder, SchemaBuilder, TableBuilder, TableRefBuilder, }; use sea_query::{ - BinOper, ColumnDef, ColumnType, Expr, ExplainStatement, ForeignKeyCreateStatement, + BinOper, ColumnDef, ColumnType, ExplainStatement, Expr, ForeignKeyCreateStatement, ForeignKeyDropStatement, IndexCreateStatement, IndexDropStatement, Oper, PostgresQueryBuilder, Quote, SelectInto, SubQueryStatement, TableAlterStatement, TableRef, TableRenameStatement, Value, @@ -143,11 +143,7 @@ impl OperLeftAssocDecider for HyperQueryBuilder { } impl PrecedenceDecider for HyperQueryBuilder { - fn inner_expr_well_known_greater_precedence( - &self, - inner: &Expr, - outer_oper: &Oper, - ) -> bool { + fn inner_expr_well_known_greater_precedence(&self, inner: &Expr, outer_oper: &Oper) -> bool { PostgresQueryBuilder.inner_expr_well_known_greater_precedence(inner, outer_oper) } } @@ -183,11 +179,7 @@ impl QueryBuilder for HyperQueryBuilder { } impl ForeignKeyBuilder for HyperQueryBuilder { - fn prepare_table_ref_fk_stmt( - &self, - table_ref: &TableRef, - sql: &mut impl sea_query::SqlWriter, - ) { + fn prepare_table_ref_fk_stmt(&self, table_ref: &TableRef, sql: &mut impl sea_query::SqlWriter) { PostgresQueryBuilder.prepare_table_ref_fk_stmt(table_ref, sql); }