Merge pull request #41 from belchior/mysql-delete

Adds Mysql syntax to Delete builder

Author: belchior

scripts/coverage_test.sh

@@ -3,6 +3,7 @@
 # Prerequisites
 # cargo install rustfilt cargo-binutils
 # rustup component add llvm-tools-preview
+clear
 
 PKG_NAME="$(grep 'name\s*=\s*"' Cargo.toml | sed -E 's/.*"(.*)"/\1/')"
 COVERAGE_OUTPUT="coverage"
@@ -11,11 +12,25 @@ COVERAGE_TARGET="target/coverage"
 rm -fr "$COVERAGE_TARGET"
 mkdir -p "$COVERAGE_OUTPUT"
 mkdir -p "$COVERAGE_TARGET"
-clear
 
+echo "\n-- ------------------------------------------------------------------------------"
+echo "-- Testing SQL Standard"
+echo "-- ------------------------------------------------------------------------------\n"
 RUSTFLAGS="-C instrument-coverage" LLVM_PROFILE_FILE="$COVERAGE_TARGET/$PKG_NAME-%m.profraw" cargo test --target-dir $COVERAGE_TARGET;
+
+echo "\n-- ------------------------------------------------------------------------------"
+echo "-- Testing PostgreSQL syntax"
+echo "-- ------------------------------------------------------------------------------\n"
 RUSTFLAGS="-C instrument-coverage" LLVM_PROFILE_FILE="$COVERAGE_TARGET/$PKG_NAME-%m.profraw" cargo test --target-dir $COVERAGE_TARGET --features postgresql;
+
+echo "\n-- ------------------------------------------------------------------------------"
+echo "-- Testing SQLite syntax"
+echo "-- ------------------------------------------------------------------------------\n"
 RUSTFLAGS="-C instrument-coverage" LLVM_PROFILE_FILE="$COVERAGE_TARGET/$PKG_NAME-%m.profraw" cargo test --target-dir $COVERAGE_TARGET --features sqlite;
+
+echo "\n-- ------------------------------------------------------------------------------"
+echo "-- Testing MySQL syntax"
+echo "-- ------------------------------------------------------------------------------\n"
 RUSTFLAGS="-C instrument-coverage" LLVM_PROFILE_FILE="$COVERAGE_TARGET/$PKG_NAME-%m.profraw" cargo test --target-dir $COVERAGE_TARGET --features mysql;
 
 cargo profdata -- merge -sparse $COVERAGE_TARGET/$PKG_NAME-*.profraw -o $COVERAGE_TARGET/$PKG_NAME.profdata;

scripts/test.sh

@@ -1,11 +1,26 @@
 #!/bin/sh
 
-test_names=$(git status -s | grep tests/ | sed -e 's/.* //' -e 's/tests\//--test /' -e 's/\.rs//' | tr '\n' ' ')
+test_names=$(git status -s | grep 'A tests/\|M tests/' | sed -e 's/.* //' -e 's/tests\//--test /' -e 's/\.rs//' | tr '\n' ' ')
 
 clear
+echo "\n-- ------------------------------------------------------------------------------"
+echo "-- Testing SQL Standard"
+echo "-- ------------------------------------------------------------------------------\n"
 cargo test $test_names
+
+echo "\n-- ------------------------------------------------------------------------------"
+echo "-- Testing PostgreSQL syntax"
+echo "-- ------------------------------------------------------------------------------\n"
 cargo test $test_names --features postgresql
+
+echo "\n-- ------------------------------------------------------------------------------"
+echo "-- Testing SQLite syntax"
+echo "-- ------------------------------------------------------------------------------\n"
 cargo test $test_names --features sqlite
+
+echo "\n-- ------------------------------------------------------------------------------"
+echo "-- Testing MySQL syntax"
+echo "-- ------------------------------------------------------------------------------\n"
 cargo test $test_names --features mysql
 
 # run only one test

scripts/watch_test.sh

@@ -10,7 +10,7 @@
 
 all_features='postgresql sqlite mysql'
 features=''
-test_names=$(git status -s | grep tests/ | sed -e 's/.* //' -e 's/tests\//--test /' -e 's/\.rs//' | tr '\n' ' ')
+test_names=$(git status -s | grep 'A tests/\|M tests/' | sed -e 's/.* //' -e 's/tests\//--test /' -e 's/\.rs//' | tr '\n' ' ')
 
 case "$@" in
   "")    features="";;

src/concat/non_standard.rs

@@ -1,7 +1,7 @@
 #[cfg(any(feature = "postgresql", feature = "sqlite", feature = "mysql"))]
 use crate::{behavior::WithQuery, concat::concat_raw_before_after, fmt};
 
-#[cfg(any(feature = "postgresql", feature = "sqlite"))]
+#[cfg(any(feature = "postgresql", feature = "sqlite", feature = "mysql"))]
 pub(crate) trait ConcatLimit<Clause: PartialEq> {
   fn concat_limit(
     &self,