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.

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

Pass the argument entity.table_ref() instead of just entity. #318

Merged
merged 8 commits into from Nov 17, 2021
Merged
Show file tree
Hide file tree
Changes from 7 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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ futures-util = { version = "^0.3" }
log = { version = "^0.4", optional = true }
rust_decimal = { version = "^1", optional = true }
sea-orm-macros = { version = "^0.3.1", path = "sea-orm-macros", optional = true }
sea-query = { version = "^0.18.0", git = "https://github.com/SeaQL/sea-query.git", features = ["thread-safe"] }
sea-query = { version = "^0.18.0", git = "https://github.com/josh-codes/sea-query.git", branch = "sea-query-change-type-into-table-ref", features = ["thread-safe"] }
billy1624 marked this conversation as resolved.
Show resolved Hide resolved
sea-strum = { version = "^0.21", features = ["derive", "sea-orm"] }
serde = { version = "^1.0", features = ["derive"] }
serde_json = { version = "^1", optional = true }
Expand Down
96 changes: 93 additions & 3 deletions src/schema/entity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,16 @@ where
);
}

stmt.table(entity).take()
stmt.table(entity.table_ref()).take()
}

#[cfg(test)]
mod tests {
use crate::{sea_query::*, tests_cfg::*, DbBackend, Schema};
use crate::{sea_query::*, tests_cfg::*, DbBackend, EntityName, Schema};
use pretty_assertions::assert_eq;

#[test]
fn test_create_table_from_entity() {
fn test_mysql_create_table_from_entity() {
let schema = Schema::new(DbBackend::MySql);
assert_eq!(
schema
Expand Down Expand Up @@ -217,4 +217,94 @@ mod tests {
.to_string(MysqlQueryBuilder)
);
}

#[test]
fn test_postgres_create_table_from_entity() {
let schema = Schema::new(DbBackend::Postgres);
assert_eq!(
schema
.create_table_from_entity(CakeFillingPrice)
.to_string(PostgresQueryBuilder),
Table::create()
.table(CakeFillingPrice.table_ref())
.col(
ColumnDef::new(cake_filling_price::Column::CakeId)
.integer()
.not_null()
)
.col(
ColumnDef::new(cake_filling_price::Column::FillingId)
.integer()
.not_null()
)
.col(
ColumnDef::new(cake_filling_price::Column::Price)
.decimal()
.not_null()
)
.primary_key(
Index::create()
.name("pk-cake_filling_price")
.col(cake_filling_price::Column::CakeId)
.col(cake_filling_price::Column::FillingId)
.primary()
)
.foreign_key(
ForeignKeyCreateStatement::new()
.name("fk-cake_filling_price-cake_filling")
.from_tbl(CakeFillingPrice)
.from_col(cake_filling_price::Column::CakeId)
.from_col(cake_filling_price::Column::FillingId)
.to_tbl(CakeFilling)
.to_col(cake_filling::Column::CakeId)
.to_col(cake_filling::Column::FillingId)
)
.to_string(PostgresQueryBuilder)
);
}

#[test]
fn test_sqlite_create_table_from_entity() {
let schema = Schema::new(DbBackend::Sqlite);
assert_eq!(
schema
.create_table_from_entity(CakeFillingPrice)
.to_string(SqliteQueryBuilder),
Table::create()
.table(CakeFillingPrice)
.col(
ColumnDef::new(cake_filling_price::Column::CakeId)
.integer()
.not_null()
)
.col(
ColumnDef::new(cake_filling_price::Column::FillingId)
.integer()
.not_null()
)
.col(
ColumnDef::new(cake_filling_price::Column::Price)
.decimal()
.not_null()
)
.primary_key(
Index::create()
.name("pk-cake_filling_price")
.col(cake_filling_price::Column::CakeId)
.col(cake_filling_price::Column::FillingId)
.primary()
)
.foreign_key(
ForeignKeyCreateStatement::new()
.name("fk-cake_filling_price-cake_filling")
.from_tbl(CakeFillingPrice)
.from_col(cake_filling_price::Column::CakeId)
.from_col(cake_filling_price::Column::FillingId)
.to_tbl(CakeFilling)
.to_col(cake_filling::Column::CakeId)
.to_col(cake_filling::Column::FillingId)
)
.to_string(SqliteQueryBuilder)
);
}
}
2 changes: 1 addition & 1 deletion tests/common/features/active_enum.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use sea_orm::entity::prelude::*;

#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
#[sea_orm(table_name = "active_enum")]
#[sea_orm(schema_name = "public", table_name = "active_enum")]
pub struct Model {
#[sea_orm(primary_key)]
pub id: i32,
Expand Down
5 changes: 3 additions & 2 deletions tests/common/features/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ pub use super::super::bakery_chain::*;
use super::*;
use crate::common::setup::{create_enum, create_table, create_table_without_asserts};
use sea_orm::{
error::*, sea_query, ConnectionTrait, DatabaseConnection, DbBackend, DbConn, ExecResult,
error::*, sea_query, ConnectionTrait, DatabaseConnection, DbBackend, DbConn, EntityName,
ExecResult,
};
use sea_query::{extension::postgres::Type, Alias, ColumnDef, ForeignKeyCreateStatement};

Expand Down Expand Up @@ -146,7 +147,7 @@ pub async fn create_active_enum_table(db: &DbConn) -> Result<ExecResult, DbErr>
DbBackend::Postgres => tea_col.custom(tea_enum),
};
let create_table_stmt = sea_query::Table::create()
.table(active_enum::Entity)
.table(active_enum::Entity.table_ref())
.col(
ColumnDef::new(active_enum::Column::Id)
.integer()
Expand Down
2 changes: 1 addition & 1 deletion tests/common/setup/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ pub async fn create_table_without_asserts(
if builder != DbBackend::Sqlite {
let stmt = builder.build(
Table::drop()
.table(Alias::new(create.get_table_name().unwrap().as_ref()))
.table(create.get_table_name().unwrap().clone())
.if_exists()
.cascade(),
);
Expand Down