Test without prepared statements against postgresql

Signed-off-by: Rodrigo Tobar <[email protected]>
ICRAR · Feb 8, 2024 · f71bf1a · f71bf1a
1 parent b3b0502
commit f71bf1a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build-and-test-ngas.yml b/.github/workflows/build-and-test-ngas.yml
@@ -33,8 +33,12 @@ jobs:
           test_number: 5
         - python: 3.9
           db: mysql
-          sql_mode: no_prepared_statement
+          use_prepared_statements: false
           test_number: 6
+        - python: 3.9
+          db: postgresql
+          use_prepared_statements: false
+          test_number: 7
     runs-on: ubuntu-20.04
 
     steps:
@@ -60,7 +64,7 @@ jobs:
       run: .travis/run_tests.sh
       env:
         DB: ${{ matrix.db }}
-        SQL_MODE: ${{ matrix.sql_mode }}
+        USE_PREPARED_STATEMENTS: ${{ matrix.use_prepared_statements }}
 
     - name: Install coveralls
       run: pip install 'coverage<5' coveralls

diff --git a/.travis/run_tests.sh b/.travis/run_tests.sh
@@ -74,13 +74,11 @@ coverage report
 # These are the user/dbname/passwd that we created on run_build
 # sqlite3 is the default so it needs no special attention
 NGAS_TESTDB=
+use_prepared_statements_attr='UsePreparedStatements="'${USE_PREPARED_STATEMENTS:-true}'"'
 if [[ "$DB" == "mysql" ]]; then
-	NGAS_TESTDB='<Db Id="blah" Snapshot="0" Interface="MySQLdb" host="127.0.0.1" database="ngas" user="ngas" password="ngas"/>'
-  if [[ "$SQL_MODE" == "no_prepared_statement" ]]; then
-    NGAS_TESTDB='<Db Id="blah" Snapshot="0" Interface="MySQLdb" UsePreparedStatement="false" host="127.0.0.1" database="ngas" user="ngas" password="ngas"/>'
-  fi
+	NGAS_TESTDB='<Db Id="blah" Snapshot="0" Interface="MySQLdb" host="127.0.0.1" database="ngas" user="ngas" password="ngas" '$use_prepared_statements_attr'/>'
 elif [[ "$DB" == "postgresql" ]]; then
-	NGAS_TESTDB='<Db Id="blah" Snapshot="0" Interface="psycopg2" host="127.0.0.1" dbname="ngas" user="ngas" password="ngas"/>'
+	NGAS_TESTDB='<Db Id="blah" Snapshot="0" Interface="psycopg2" host="127.0.0.1" dbname="ngas" user="ngas" password="ngas" '$use_prepared_statements_attr'/>'
 fi
 export NGAS_TESTDB