Skip to content

Commit 0c4646c

Browse files
Now sqlite feature is enabled when returning_clauses_for_sqlite_3_35 is enabled
1 parent 0abaf1b commit 0c4646c

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

diesel/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ ipnet-address = ["dep:ipnet", "dep:libc"]
8888
numeric = ["dep:num-bigint", "dep:bigdecimal", "dep:num-traits", "dep:num-integer", "diesel_derives/numeric"]
8989
postgres_backend = ["diesel_derives/postgres", "dep:bitflags", "dep:byteorder", "dep:itoa"]
9090
mysql_backend = ["diesel_derives/mysql", "dep:byteorder"]
91-
returning_clauses_for_sqlite_3_35 = []
91+
returning_clauses_for_sqlite_3_35 = ["sqlite"]
9292
i-implement-a-third-party-backend-and-opt-into-breaking-changes = []
9393
r2d2 = ["diesel_derives/r2d2", "dep:r2d2"]
9494
chrono = ["diesel_derives/chrono", "dep:chrono"]

diesel_tests/tests/insert.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ fn insert_records_as_boxed_static_array() {
152152
}
153153

154154
#[diesel_test_helper::test]
155-
#[cfg(all(feature = "sqlite", feature = "returning_clauses_for_sqlite_3_35"))]
155+
#[cfg(feature = "returning_clauses_for_sqlite_3_35")]
156156
fn insert_record_using_returning_clause() {
157157
use crate::schema::users::table as users;
158158
let connection = &mut connection();
@@ -172,7 +172,7 @@ fn insert_record_using_returning_clause() {
172172
}
173173

174174
#[diesel_test_helper::test]
175-
#[cfg(all(feature = "sqlite", feature = "returning_clauses_for_sqlite_3_35"))]
175+
#[cfg(feature = "returning_clauses_for_sqlite_3_35")]
176176
fn insert_record_attached_database_using_returning_clause() {
177177
table! {
178178
external.external_table (id) {
@@ -220,7 +220,7 @@ fn insert_record_attached_database_using_returning_clause() {
220220

221221
#[diesel_test_helper::test]
222222
#[cfg(not(any(
223-
not(all(feature = "sqlite", feature = "returning_clauses_for_sqlite_3_35")),
223+
not(feature = "returning_clauses_for_sqlite_3_35"),
224224
feature = "mysql"
225225
)))]
226226
fn insert_records_using_returning_clause() {
@@ -252,7 +252,7 @@ fn insert_records_using_returning_clause() {
252252
}
253253

254254
#[diesel_test_helper::test]
255-
#[cfg(all(feature = "sqlite", feature = "returning_clauses_for_sqlite_3_35"))]
255+
#[cfg(feature = "returning_clauses_for_sqlite_3_35")]
256256
fn insert_record_with_custom_returning_clause() {
257257
use crate::schema::users::dsl::*;
258258

@@ -568,7 +568,7 @@ fn upsert_empty_slice() {
568568
#[diesel_test_helper::test]
569569
#[cfg(any(
570570
feature = "postgres",
571-
all(feature = "sqlite", feature = "returning_clauses_for_sqlite_3_35")
571+
feature = "returning_clauses_for_sqlite_3_35"
572572
))]
573573
fn insert_only_default_values_with_returning() {
574574
use crate::schema::users::id;
@@ -833,7 +833,7 @@ fn batch_insert_is_atomic_on_sqlite() {
833833
}
834834

835835
#[diesel_test_helper::test]
836-
#[cfg(all(feature = "sqlite", feature = "returning_clauses_for_sqlite_3_35"))]
836+
#[cfg(feature = "returning_clauses_for_sqlite_3_35")]
837837
fn batch_insert_with_returning_is_atomic_on_sqlite() {
838838
use crate::schema::users::dsl::*;
839839
let connection = &mut connection();
@@ -848,7 +848,7 @@ fn batch_insert_with_returning_is_atomic_on_sqlite() {
848848
}
849849

850850
#[diesel_test_helper::test]
851-
#[cfg(all(feature = "sqlite", feature = "returning_clauses_for_sqlite_3_35"))]
851+
#[cfg(feature = "returning_clauses_for_sqlite_3_35")]
852852
fn batch_insert_with_defaultables_and_returning_is_atomic_on_sqlite() {
853853
use crate::schema::users::dsl::*;
854854
let connection = &mut connection();
@@ -863,7 +863,7 @@ fn batch_insert_with_defaultables_and_returning_is_atomic_on_sqlite() {
863863
}
864864

865865
#[diesel_test_helper::test]
866-
#[cfg(all(feature = "sqlite", feature = "returning_clauses_for_sqlite_3_35"))]
866+
#[cfg(feature = "returning_clauses_for_sqlite_3_35")]
867867
fn batch_upsert_with_defaultables_and_returning_is_atomic_on_sqlite() {
868868
use crate::schema::users::dsl::*;
869869
let connection = &mut connection();
@@ -1022,7 +1022,7 @@ fn batch_upsert_non_default_values() {
10221022
#[diesel_test_helper::test]
10231023
#[cfg(any(
10241024
feature = "postgres",
1025-
all(feature = "sqlite", feature = "returning_clauses_for_sqlite_3_35")
1025+
feature = "returning_clauses_for_sqlite_3_35"
10261026
))]
10271027
fn batch_upsert_with_returning() {
10281028
use crate::schema::users;

diesel_tests/tests/update.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ fn upsert_with_sql_literal_for_target() {
381381
#[diesel_test_helper::test]
382382
#[cfg(any(
383383
feature = "postgres",
384-
all(feature = "sqlite", feature = "returning_clauses_for_sqlite_3_35")
384+
feature = "returning_clauses_for_sqlite_3_35"
385385
))]
386386
fn upsert_for_target_with_condition() {
387387
use crate::schema::comments::dsl::*;

0 commit comments

Comments
 (0)