Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 15 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sea-query-hyperdb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ categories = ["database"]
workspace = true

[dependencies]
sea-query = "0.32"
sea-query = "1.0"
2 changes: 1 addition & 1 deletion sea-query-hyperdb/examples/basic_usage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
59 changes: 34 additions & 25 deletions sea-query-hyperdb/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -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, ExplainStatement, Expr, ForeignKeyCreateStatement,
ForeignKeyDropStatement, IndexCreateStatement, IndexDropStatement, Oper, PostgresQueryBuilder,
Quote, SelectInto, SubQueryStatement, TableAlterStatement, TableRef, TableRenameStatement,
Value,
};

/// HyperDB-specific SQL dialect backend for sea-query.
Expand Down Expand Up @@ -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)]
Expand Down Expand Up @@ -142,11 +143,7 @@ impl OperLeftAssocDecider for HyperQueryBuilder {
}

impl PrecedenceDecider for HyperQueryBuilder {
fn inner_expr_well_known_greater_precedence(
&self,
inner: &SimpleExpr,
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)
}
}
Expand All @@ -155,29 +152,41 @@ 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);
Expand All @@ -186,7 +195,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);
Expand All @@ -197,42 +206,42 @@ 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);
}

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);
}

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);
}

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);
}

Expand All @@ -243,15 +252,15 @@ 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);
}

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);
}
Expand All @@ -264,7 +273,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 {
Expand Down
Loading