Skip to content

Adds Mysql syntax to DropTable builder #51

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

Merged
merged 1 commit into from
Apr 19, 2025
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
12 changes: 6 additions & 6 deletions src/drop_table/drop_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ impl DropTable {
/// ### Example 1
///
///```
/// # #[cfg(not(feature = "postgresql"))]
/// # #[cfg(not(any(feature = "postgresql", feature = "mysql")))]
/// # {
/// # use sql_query_builder as sql;
/// let query = sql::DropTable::new()
Expand All @@ -57,12 +57,12 @@ impl DropTable {
/// DROP TABLE orders
/// ```
///
/// ### Example 2 `crate features postgresql only`
/// ### Example 2 `crate features postgresql and mysql only`
///
/// Multiples call will concatenates all values
///
///```
/// # #[cfg(feature = "postgresql")]
/// # #[cfg(any(feature = "postgresql", feature = "mysql"))]
/// # {
/// # use sql_query_builder as sql;
/// let query = sql::DropTable::new()
Expand Down Expand Up @@ -90,7 +90,7 @@ impl DropTable {
/// ### Example 1
///
/// ```
/// # #[cfg(not(feature = "postgresql"))]
/// # #[cfg(not(any(feature = "postgresql", feature = "mysql")))]
/// # {
/// # use sql_query_builder as sql;
/// let query = sql::DropTable::new()
Expand All @@ -109,12 +109,12 @@ impl DropTable {
/// DROP TABLE IF EXISTS orders
/// ```
///
/// ### Example 2 `crate features postgresql only`
/// ### Example 2 `crate features postgresql and mysql only`
///
/// Multiples call will concatenates all values
///
/// ```
/// # #[cfg(feature = "postgresql")]
/// # #[cfg(any(feature = "postgresql", feature = "mysql"))]
/// # {
/// # use sql_query_builder as sql;
/// let query = sql::DropTable::new()
Expand Down
2 changes: 1 addition & 1 deletion src/drop_table/drop_table_internal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl DropTable {
"".to_string()
};

let table_names = if cfg!(any(feature = "postgresql")) {
let table_names = if cfg!(any(feature = "postgresql", feature = "mysql")) {
self
._drop_table
.iter()
Expand Down
183 changes: 119 additions & 64 deletions tests/command_drop_table_spec.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,60 @@
mod full_api {
use pretty_assertions::assert_eq;
use sql_query_builder as sql;

// SQL Standard
#[test]
fn sql_standard_with_all_methods() {
let query = sql::DropTable::new().drop_table("users_name_idx").as_string();

let expected_query = "DROP TABLE users_name_idx";

assert_eq!(expected_query, query);
}

#[cfg(feature = "postgresql")]
#[test]
fn postgres_with_all_methods() {
let query = sql::DropTable::new()
// at least one of methods
.drop_table("users_name_idx")
.drop_table_if_exists("users_login_idx")
.as_string();

let expected_query = "DROP TABLE IF EXISTS users_name_idx, users_login_idx";

assert_eq!(expected_query, query);
}

#[cfg(feature = "sqlite")]
#[test]
fn sqlite_with_all_methods() {
let query = sql::DropTable::new()
// at least one of methods
.drop_table("users_name_idx")
.drop_table_if_exists("users_login_idx")
.as_string();

let expected_query = "DROP TABLE IF EXISTS users_login_idx";

assert_eq!(expected_query, query);
}

#[cfg(feature = "mysql")]
#[test]
fn mysql_with_all_methods() {
let query = sql::DropTable::new()
// at least one of methods
.drop_table("users_name_idx")
.drop_table_if_exists("users_login_idx")
.as_string();

let expected_query = "DROP TABLE IF EXISTS users_name_idx, users_login_idx";

assert_eq!(expected_query, query);
}
}

mod builder_features {
use pretty_assertions::assert_eq;
use sql_query_builder as sql;
Expand Down Expand Up @@ -26,7 +83,7 @@ mod builder_features {
assert_eq!(expected_query, query);
}

#[cfg(not(feature = "postgresql"))]
#[cfg(not(any(feature = "postgresql", feature = "mysql")))]
#[test]
fn drop_table_builder_should_be_able_to_conditionally_add_clauses() {
let mut drop_table = sql::DropTable::new().drop_table("orders");
Expand All @@ -41,7 +98,7 @@ mod builder_features {
assert_eq!(expected_query, query);
}

#[cfg(feature = "postgresql")]
#[cfg(any(feature = "postgresql", feature = "mysql"))]
#[test]
fn drop_table_builder_should_be_able_to_conditionally_add_clauses() {
let mut drop_table = sql::DropTable::new().drop_table("orders");
Expand All @@ -56,7 +113,7 @@ mod builder_features {
assert_eq!(expected_query, query);
}

#[cfg(not(feature = "postgresql"))]
#[cfg(not(any(feature = "postgresql", feature = "mysql")))]
#[test]
fn drop_table_builder_should_be_cloneable() {
let drop_users = sql::DropTable::new().drop_table("users");
Expand All @@ -69,7 +126,7 @@ mod builder_features {
assert_eq!(expected_drop_users_and_orders, drop_users_and_orders.as_string());
}

#[cfg(feature = "postgresql")]
#[cfg(any(feature = "postgresql", feature = "mysql"))]
#[test]
fn drop_table_builder_should_be_cloneable() {
let drop_users = sql::DropTable::new().drop_table("users");
Expand Down Expand Up @@ -130,18 +187,18 @@ mod builder_methods {

#[test]
fn method_debug_should_print_at_console_in_a_human_readable_format() {
let query = sql::DropTable::new().drop_table_if_exists("users").debug().as_string();
let query = sql::DropTable::new().drop_table("users").debug().as_string();

let expected_query = "DROP TABLE IF EXISTS users";
let expected_query = "DROP TABLE users";

assert_eq!(expected_query, query);
}

#[test]
fn method_print_should_print_in_one_line_the_current_state_of_builder() {
let query = sql::DropTable::new().drop_table_if_exists("users").print().as_string();
let query = sql::DropTable::new().drop_table("users").print().as_string();

let expected_query = "DROP TABLE IF EXISTS users";
let expected_query = "DROP TABLE users";

assert_eq!(expected_query, query);
}
Expand Down Expand Up @@ -237,28 +294,50 @@ mod method_drop_table {
assert_eq!(expected_query, query);
}

#[cfg(not(feature = "postgresql"))]
#[test]
fn method_drop_table_should_overrides_previous_value_on_consecutive_calls() {
fn method_drop_table_should_trim_space_of_the_argument() {
let query = sql::DropTable::new().drop_table(" films ").as_string();
let expected_query = "DROP TABLE films";

assert_eq!(expected_query, query);
}

#[test]
fn method_raw_before_should_add_raw_sql_before_method_drop_table() {
let query = sql::DropTable::new()
.raw_before(sql::DropTableParams::DropTable, "/* drop command */")
.drop_table("films")
.drop_table("series")
.as_string();
let expected_query = "/* drop command */ DROP TABLE films";

let expected_query = "DROP TABLE series";
assert_eq!(expected_query, query);
}

#[test]
fn method_raw_after_should_add_raw_sql_after_method_drop_table() {
let query = sql::DropTable::new()
.drop_table("films")
.raw_after(sql::DropTableParams::DropTable, "RESTRICT")
.as_string();
let expected_query = "DROP TABLE films RESTRICT";

assert_eq!(expected_query, query);
}

#[cfg(not(any(feature = "postgresql", feature = "mysql")))]
#[test]
fn method_drop_table_should_trim_space_of_the_argument() {
let query = sql::DropTable::new().drop_table(" films ").as_string();
let expected_query = "DROP TABLE films";
fn method_drop_table_should_overrides_previous_value_on_consecutive_calls() {
let query = sql::DropTable::new()
.drop_table("films")
.drop_table("series")
.as_string();

let expected_query = "DROP TABLE series";

assert_eq!(expected_query, query);
}

#[cfg(not(feature = "postgresql"))]
#[cfg(not(any(feature = "postgresql", feature = "mysql")))]
#[test]
fn method_drop_table_should_not_accumulate_arguments_with_the_same_content() {
let query = sql::DropTable::new()
Expand All @@ -270,24 +349,29 @@ mod method_drop_table {
assert_eq!(expected_query, query);
}

#[cfg(any(feature = "postgresql", feature = "mysql"))]
#[test]
fn method_raw_before_should_add_raw_sql_before_method_drop_table() {
fn method_drop_table_should_accumulate_values_on_consecutive_calls() {
let query = sql::DropTable::new()
.raw_before(sql::DropTableParams::DropTable, "/* drop command */")
.drop_table("films")
.drop_table("series")
.as_string();
let expected_query = "/* drop command */ DROP TABLE films";

let expected_query = "DROP TABLE films, series";

assert_eq!(expected_query, query);
}

#[cfg(any(feature = "postgresql", feature = "mysql"))]
#[test]
fn method_raw_after_should_add_raw_sql_after_method_drop_table() {
fn method_drop_table_should_not_accumulate_values_when_expression_is_empty() {
let query = sql::DropTable::new()
.drop_table("films")
.raw_after(sql::DropTableParams::DropTable, "RESTRICT")
.drop_table("")
.drop_table("series")
.drop_table("")
.as_string();
let expected_query = "DROP TABLE films RESTRICT";

let expected_query = "DROP TABLE series";

assert_eq!(expected_query, query);
}
Expand All @@ -305,19 +389,6 @@ mod method_drop_table_if_exists {
assert_eq!(expected_query, query);
}

#[cfg(not(feature = "postgresql"))]
#[test]
fn method_drop_table_if_exists_should_overrides_previous_value_on_consecutive_calls() {
let query = sql::DropTable::new()
.drop_table_if_exists("films")
.drop_table_if_exists("series")
.as_string();

let expected_query = "DROP TABLE IF EXISTS series";

assert_eq!(expected_query, query);
}

#[test]
fn method_drop_table_if_exists_should_trim_space_of_the_argument() {
let query = sql::DropTable::new().drop_table_if_exists(" films ").as_string();
Expand All @@ -326,18 +397,6 @@ mod method_drop_table_if_exists {
assert_eq!(expected_query, query);
}

#[cfg(not(feature = "postgresql"))]
#[test]
fn method_drop_table_if_exists_should_not_accumulate_arguments_with_the_same_content() {
let query = sql::DropTable::new()
.drop_table_if_exists("films")
.drop_table_if_exists("films")
.as_string();
let expected_query = "DROP TABLE IF EXISTS films";

assert_eq!(expected_query, query);
}

#[test]
fn method_raw_before_should_add_raw_sql_before_method_drop_table_if_exists() {
let query = sql::DropTable::new()
Expand All @@ -359,38 +418,33 @@ mod method_drop_table_if_exists {

assert_eq!(expected_query, query);
}
}

#[cfg(feature = "postgresql")]
mod postgres_feature_flag {
use pretty_assertions::assert_eq;
use sql_query_builder as sql;

#[cfg(not(any(feature = "postgresql", feature = "mysql")))]
#[test]
fn method_drop_table_should_accumulate_values_on_consecutive_calls() {
fn method_drop_table_if_exists_should_overrides_previous_value_on_consecutive_calls() {
let query = sql::DropTable::new()
.drop_table("films")
.drop_table("series")
.drop_table_if_exists("films")
.drop_table_if_exists("series")
.as_string();

let expected_query = "DROP TABLE films, series";
let expected_query = "DROP TABLE IF EXISTS series";

assert_eq!(expected_query, query);
}

#[cfg(not(any(feature = "postgresql", feature = "mysql")))]
#[test]
fn method_drop_table_should_not_accumulate_values_when_expression_is_empty() {
fn method_drop_table_if_exists_should_not_accumulate_arguments_with_the_same_content() {
let query = sql::DropTable::new()
.drop_table("")
.drop_table("series")
.drop_table("")
.drop_table_if_exists("films")
.drop_table_if_exists("films")
.as_string();

let expected_query = "DROP TABLE series";
let expected_query = "DROP TABLE IF EXISTS films";

assert_eq!(expected_query, query);
}

#[cfg(any(feature = "postgresql", feature = "mysql"))]
#[test]
fn method_drop_table_if_exists_should_accumulate_values_on_consecutive_calls() {
let query = sql::DropTable::new()
Expand All @@ -403,6 +457,7 @@ mod postgres_feature_flag {
assert_eq!(expected_query, query);
}

#[cfg(any(feature = "postgresql", feature = "mysql"))]
#[test]
fn method_drop_table_if_exists_should_not_accumulate_values_when_expression_is_empty() {
let query = sql::DropTable::new()
Expand Down
Loading