Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SeaQuery 0.28.x #90

Merged
merged 6 commits into from
Dec 12, 2022
Merged

SeaQuery 0.28.x #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b54289
MSRV 1.62
billy1624 Dec 6, 2022
f5b2d50
Bump SeaQuery to 0.28.0
billy1624 Dec 6, 2022
d302e04
Fixup
billy1624 Dec 6, 2022
d8c8d48
Revert
billy1624 Dec 6, 2022
b624dff
Merge branch 'master' into msrv-1.62
billy1624 Dec 12, 2022
cc29c6f
Bump sea-query to newly released 0.28.0
billy1624 Dec 12, 2022
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
5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ documentation = "https://docs.rs/sea-schema"
repository = "https://github.com/SeaQL/sea-schema"
categories = ["database"]
keywords = ["database", "sql", "mysql", "postgres"]
rust-version = "1.62"

[package.metadata.docs.rs]
features = ["default"]
Expand All @@ -35,8 +36,8 @@ path = "src/lib.rs"
[dependencies]
futures = { version = "0.3", optional = true }
sea-schema-derive = { version = "0.1.0", path = "sea-schema-derive" }
sea-query = { version = "^0.27.1" }
sea-query-binder = { version = "^0.2", optional = true }
sea-query = { version = "^0.28.0" }
sea-query-binder = { version = "^0.3", optional = true }
serde = { version = "^1", features = ["derive"], optional = true }
sqlx = { version = "^0.6", optional = true }
log = { version = "^0.4", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/mysql/probe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ impl SchemaProbe for MySql {
.cond_where(
Condition::all().add(
Expr::expr(Self::get_current_schema())
.equals(Schema::Tables, TablesFields::TableSchema),
.equals((Schema::Tables, TablesFields::TableSchema)),
),
)
.take()
Expand Down
4 changes: 2 additions & 2 deletions src/mysql/query/foreign_key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ impl SchemaQueryBuilder {
.inner_join(
(Schema::Schema, Schema::ReferentialConstraints),
Expr::tbl(Schema::KeyColumnUsage, Key::ConstraintSchema)
.equals(Schema::ReferentialConstraints, Ref::ConstraintSchema)
.equals((Schema::ReferentialConstraints, Ref::ConstraintSchema))
.and(
Expr::tbl(Schema::KeyColumnUsage, Key::ConstraintName)
.equals(Schema::ReferentialConstraints, Ref::ConstraintName),
.equals((Schema::ReferentialConstraints, Ref::ConstraintName)),
),
)
.and_where(
Expand Down
2 changes: 1 addition & 1 deletion src/mysql/query/table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ impl SchemaQueryBuilder {
Schema::CollationCharacterSet,
CharacterSetFields::CollationName,
)
.equals(Schema::Tables, TablesFields::TableCollation),
.equals((Schema::Tables, TablesFields::TableCollation)),
)
.and_where(Expr::col(TablesFields::TableSchema).eq(schema.to_string()))
.and_where(Expr::col(TablesFields::TableType).is_in([
Expand Down
4 changes: 1 addition & 3 deletions src/mysql/query/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ pub struct VersionQueryResult {

impl SchemaQueryBuilder {
pub fn query_version(&self) -> SelectStatement {
Query::select()
.expr(Func::cust(MysqlFunc::Version).into_simple_expr())
.take()
Query::select().expr(Func::cust(MysqlFunc::Version)).take()
}
}

Expand Down
91 changes: 24 additions & 67 deletions src/mysql/writer/column.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,66 +53,38 @@ impl ColumnInfo {
col_def.custom(self.col_type.clone());
}
Type::TinyInt(num_attr) => {
if num_attr.unsigned.is_some() {
match num_attr.maximum {
Some(maximum) => col_def.tiny_unsigned_len(maximum),
None => col_def.tiny_unsigned(),
};
} else {
match num_attr.maximum {
Some(maximum) => col_def.tiny_integer_len(maximum),
None => col_def.tiny_integer(),
};
}
match num_attr.unsigned {
Some(_) => col_def.tiny_unsigned(),
None => col_def.tiny_integer(),
};
col_def = self.write_num_attr(col_def, num_attr);
}
Type::Bool => {
col_def.boolean();
}
Type::SmallInt(num_attr) => {
if num_attr.unsigned.is_some() {
match num_attr.maximum {
Some(maximum) => col_def.small_unsigned_len(maximum),
None => col_def.small_unsigned(),
};
} else {
match num_attr.maximum {
Some(maximum) => col_def.small_integer_len(maximum),
None => col_def.small_integer(),
};
}
match num_attr.unsigned {
Some(_) => col_def.small_unsigned(),
None => col_def.small_integer(),
};
col_def = self.write_num_attr(col_def, num_attr);
}
Type::MediumInt(_) => {
// FIXME: Unresolved type mapping
col_def.custom(self.col_type.clone());
}
Type::Int(num_attr) => {
if num_attr.unsigned.is_some() {
match num_attr.maximum {
Some(maximum) => col_def.unsigned_len(maximum),
None => col_def.unsigned(),
};
} else {
match num_attr.maximum {
Some(maximum) => col_def.integer_len(maximum),
None => col_def.integer(),
};
}
match num_attr.unsigned {
Some(_) => col_def.unsigned(),
None => col_def.integer(),
};
col_def = self.write_num_attr(col_def, num_attr);
}
Type::BigInt(num_attr) => {
if num_attr.unsigned.is_some() {
match num_attr.maximum {
Some(maximum) => col_def.big_unsigned_len(maximum),
None => col_def.big_unsigned(),
};
} else {
match num_attr.maximum {
Some(maximum) => col_def.big_integer_len(maximum),
None => col_def.big_integer(),
};
}
match num_attr.unsigned {
Some(_) => col_def.big_unsigned(),
None => col_def.big_integer(),
};
col_def = self.write_num_attr(col_def, num_attr);
}
Type::Decimal(num_attr) => {
Expand All @@ -123,39 +95,24 @@ impl ColumnInfo {
col_def = self.write_num_attr(col_def, num_attr);
}
Type::Float(num_attr) => {
match num_attr.decimal {
Some(decimal) => col_def.float_len(decimal),
_ => col_def.float(),
};
col_def.float();
col_def = self.write_num_attr(col_def, num_attr);
}
Type::Double(num_attr) => {
match num_attr.decimal {
Some(decimal) => col_def.double_len(decimal),
_ => col_def.double(),
};
col_def.double();
col_def = self.write_num_attr(col_def, num_attr);
}
Type::Date => {
col_def.date();
}
Type::Time(time_attr) => {
match time_attr.fractional {
Some(fractional) => col_def.time_len(fractional),
_ => col_def.time(),
};
Type::Time(_) => {
col_def.time();
}
Type::DateTime(time_attr) => {
match time_attr.fractional {
Some(fractional) => col_def.date_time_len(fractional),
_ => col_def.date_time(),
};
Type::DateTime(_) => {
col_def.date_time();
}
Type::Timestamp(time_attr) => {
match time_attr.fractional {
Some(fractional) => col_def.timestamp_len(fractional),
_ => col_def.timestamp(),
};
Type::Timestamp(_) => {
col_def.timestamp();
}
Type::Year => {
// FIXME: Unresolved type mapping
Expand Down
2 changes: 1 addition & 1 deletion src/postgres/probe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ impl SchemaProbe for Postgres {
Condition::all()
.add(
Expr::expr(Self::get_current_schema())
.equals(Schema::Tables, TablesFields::TableSchema),
.equals((Schema::Tables, TablesFields::TableSchema)),
)
.add(Expr::col(TablesFields::TableType).eq("BASE TABLE")),
)
Expand Down
22 changes: 11 additions & 11 deletions src/postgres/query/constraints/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ impl SchemaQueryBuilder {
Condition::all()
.add(
Expr::tbl(Schema::TableConstraints, Tcf::ConstraintName)
.equals(Schema::CheckConstraints, Cf::ConstraintName),
.equals((Schema::CheckConstraints, Cf::ConstraintName)),
)
.add(
Expr::tbl(Schema::TableConstraints, Tcf::ConstraintCatalog)
.equals(Schema::CheckConstraints, Cf::ConstraintCatalog),
.equals((Schema::CheckConstraints, Cf::ConstraintCatalog)),
)
.add(
Expr::tbl(Schema::TableConstraints, Tcf::ConstraintSchema)
.equals(Schema::CheckConstraints, Cf::ConstraintSchema),
.equals((Schema::CheckConstraints, Cf::ConstraintSchema)),
),
)
.join(
Expand All @@ -108,27 +108,27 @@ impl SchemaQueryBuilder {
Condition::all()
.add(
Expr::tbl(Schema::TableConstraints, Tcf::ConstraintName)
.equals(Schema::KeyColumnUsage, Kcuf::ConstraintName),
.equals((Schema::KeyColumnUsage, Kcuf::ConstraintName)),
)
.add(
Expr::tbl(Schema::TableConstraints, Tcf::ConstraintCatalog)
.equals(Schema::KeyColumnUsage, Kcuf::ConstraintCatalog),
.equals((Schema::KeyColumnUsage, Kcuf::ConstraintCatalog)),
)
.add(
Expr::tbl(Schema::TableConstraints, Tcf::ConstraintSchema)
.equals(Schema::KeyColumnUsage, Kcuf::ConstraintSchema),
.equals((Schema::KeyColumnUsage, Kcuf::ConstraintSchema)),
)
.add(
Expr::tbl(Schema::TableConstraints, Tcf::TableCatalog)
.equals(Schema::KeyColumnUsage, Kcuf::TableCatalog),
.equals((Schema::KeyColumnUsage, Kcuf::TableCatalog)),
)
.add(
Expr::tbl(Schema::TableConstraints, Tcf::TableSchema)
.equals(Schema::KeyColumnUsage, Kcuf::TableSchema),
.equals((Schema::KeyColumnUsage, Kcuf::TableSchema)),
)
.add(
Expr::tbl(Schema::TableConstraints, Tcf::TableName)
.equals(Schema::KeyColumnUsage, Kcuf::TableName),
.equals((Schema::KeyColumnUsage, Kcuf::TableName)),
),
)
.join_subquery(
Expand All @@ -151,12 +151,12 @@ impl SchemaQueryBuilder {
.left_join(
(Schema::Schema, Schema::ConstraintColumnUsage),
Expr::tbl(Schema::ReferentialConstraints, RefC::ConstraintName)
.equals(Schema::ConstraintColumnUsage, Kcuf::ConstraintName),
.equals((Schema::ConstraintColumnUsage, Kcuf::ConstraintName)),
)
.take(),
rcsq.clone(),
Expr::tbl(Schema::TableConstraints, Tcf::ConstraintName)
.equals(rcsq.clone(), RefC::ConstraintName),
.equals((rcsq.clone(), RefC::ConstraintName)),
)
.and_where(
Expr::col((Schema::TableConstraints, Tcf::TableSchema)).eq(schema.to_string()),
Expand Down
2 changes: 1 addition & 1 deletion src/postgres/query/enumeration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ impl SchemaQueryBuilder {
.from(PgType::Table)
.inner_join(
PgEnum::Table,
Expr::tbl(PgEnum::Table, PgEnum::EnumTypeId).equals(PgType::Table, PgType::Oid),
Expr::tbl(PgEnum::Table, PgEnum::EnumTypeId).equals((PgType::Table, PgType::Oid)),
)
.order_by((PgType::Table, PgType::TypeName), Order::Asc)
.order_by((PgEnum::Table, PgEnum::EnumLabel), Order::Asc)
Expand Down
34 changes: 14 additions & 20 deletions src/postgres/writer/column.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ impl ColumnInfo {
pub fn write_col_type(&self) -> ColumnType {
fn write_type(col_type: &Type) -> ColumnType {
match col_type {
Type::SmallInt => ColumnType::SmallInteger(None),
Type::Integer => ColumnType::Integer(None),
Type::BigInt => ColumnType::BigInteger(None),
Type::SmallInt => ColumnType::SmallInteger,
Type::Integer => ColumnType::Integer,
Type::BigInt => ColumnType::BigInteger,
Type::Decimal(num_attr) | Type::Numeric(num_attr) => {
match (num_attr.precision, num_attr.scale) {
(None, None) => ColumnType::Decimal(None),
Expand All @@ -66,11 +66,11 @@ impl ColumnInfo {
))),
}
}
Type::Real => ColumnType::Float(None),
Type::DoublePrecision => ColumnType::Double(None),
Type::SmallSerial => ColumnType::SmallInteger(None),
Type::Serial => ColumnType::Integer(None),
Type::BigSerial => ColumnType::BigInteger(None),
Type::Real => ColumnType::Float,
Type::DoublePrecision => ColumnType::Double,
Type::SmallSerial => ColumnType::SmallInteger,
Type::Serial => ColumnType::Integer,
Type::BigSerial => ColumnType::BigInteger,
Type::Money => ColumnType::Money(None),
Type::Varchar(string_attr) => {
ColumnType::String(string_attr.length.map(Into::into))
Expand All @@ -80,17 +80,11 @@ impl ColumnInfo {
Type::Bytea => ColumnType::Binary(BlobSize::Blob(None)),
// The SQL standard requires that writing just timestamp be equivalent to timestamp without time zone,
// and PostgreSQL honors that behavior. (https://www.postgresql.org/docs/current/datatype-datetime.html)
Type::Timestamp(time_attr) => {
ColumnType::DateTime(time_attr.precision.map(Into::into))
}
Type::TimestampWithTimeZone(time_attr) => {
ColumnType::TimestampWithTimeZone(time_attr.precision.map(Into::into))
}
Type::Timestamp(_) => ColumnType::DateTime,
Type::TimestampWithTimeZone(_) => ColumnType::TimestampWithTimeZone,
Type::Date => ColumnType::Date,
Type::Time(time_attr) => ColumnType::Time(time_attr.precision.map(Into::into)),
Type::TimeWithTimeZone(time_attr) => {
ColumnType::Time(time_attr.precision.map(Into::into))
}
Type::Time(_) => ColumnType::Time,
Type::TimeWithTimeZone(_) => ColumnType::Time,
Type::Interval(interval_attr) => {
let field = match &interval_attr.field {
Some(field) => PgInterval::try_from(field).ok(),
Expand Down Expand Up @@ -146,9 +140,9 @@ impl ColumnInfo {
.collect();
ColumnType::Enum { name, variants }
}
Type::Array(array_def) => ColumnType::Array(SeaRc::new(Box::new(write_type(
Type::Array(array_def) => ColumnType::Array(SeaRc::new(write_type(
array_def.col_type.as_ref().expect("Array type not defined"),
)))),
))),
}
}
write_type(&self.col_type)
Expand Down
2 changes: 1 addition & 1 deletion src/probe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub trait SchemaProbe {
Condition::all()
.add(
Expr::expr(Self::get_current_schema())
.equals(Alias::new("columns"), Alias::new("table_schema")),
.equals((Alias::new("columns"), Alias::new("table_schema"))),
)
.add(Expr::col(Alias::new("table_name")).eq(table.as_ref()))
.add(Expr::col(Alias::new("column_name")).eq(column.as_ref())),
Expand Down
6 changes: 3 additions & 3 deletions tests/live/postgres/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ fn create_order_table() -> TableCreateStatement {
)
.col(
ColumnDef::new(Alias::new("placed_at"))
.date_time_len(6)
.date_time()
.not_null(),
)
.primary_key(
Expand Down Expand Up @@ -333,9 +333,9 @@ fn create_collection_table() -> TableCreateStatement {
)
.col(
ColumnDef::new(Alias::new("integers"))
.array(ColumnType::Integer(None))
.array(ColumnType::Integer)
.not_null(),
)
.col(ColumnDef::new(Alias::new("integers_opt")).array(ColumnType::Integer(None)))
.col(ColumnDef::new(Alias::new("integers_opt")).array(ColumnType::Integer))
.to_owned()
}