tests: support sqlite3 version 3.46.0+

oliver-sanders · oliver-sanders · commit f3df4b817a4a · 2025-03-11T11:38:08.000Z
* Closes #6630 * Fixes SQL statements in functional tests to recent changes in sqlite3.
diff --git a/tests/flakyfunctional/database/00-simple.t b/tests/flakyfunctional/database/00-simple.t
@@ -38,8 +38,8 @@ cmp_ok "${NAME}" "${SORTED_ORIG}"
 
 NAME='select-workflow-params.out'
 sqlite3 "${DB_FILE}" \
-    'SELECT key, value FROM workflow_params
-    WHERE key != "uuid_str" AND key != "cycle_point_tz" ORDER BY key' \
+    "SELECT key, value FROM workflow_params
+    WHERE key != 'uuid_str' AND key != 'cycle_point_tz' ORDER BY key" \
     >"${NAME}"
 cmp_ok "${NAME}" << __EOF__
 UTC_mode|0
diff --git a/tests/flakyfunctional/hold-release/15-hold-after.t b/tests/flakyfunctional/hold-release/15-hold-after.t
@@ -27,7 +27,7 @@ run_ok "${TEST_NAME_BASE}-validate" cylc validate "${WORKFLOW_NAME}"
 workflow_run_ok "${TEST_NAME_BASE}-1" \
     cylc play --reference-test --debug --no-detach "${WORKFLOW_NAME}"
 sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-    'SELECT cycle, name, status FROM task_pool WHERE cycle=="20140102T0000Z" ORDER BY name' \
+    "SELECT cycle, name, status FROM task_pool WHERE cycle=='20140102T0000Z' ORDER BY name" \
     >'taskpool.out'
 cmp_ok 'taskpool.out' <<'__OUT__'
 20140102T0000Z|foo|waiting
diff --git a/tests/flakyfunctional/job-submission/19-chatty.t b/tests/flakyfunctional/job-submission/19-chatty.t
@@ -70,7 +70,7 @@ done
 # Task pool in database contains the correct states
 TEST_NAME="${TEST_NAME_BASE}-db-task-pool"
 DB_FILE="${WORKFLOW_RUN_DIR}/log/db"
-QUERY='SELECT cycle, name, status FROM task_states WHERE name LIKE "nh%"'
+QUERY="SELECT cycle, name, status FROM task_states WHERE name LIKE 'nh%'"
 run_ok "$TEST_NAME" sqlite3 "$DB_FILE" "$QUERY"
 sort "${TEST_NAME}.stdout" > "${TEST_NAME}.stdout.sorted"
 cmp_ok "${TEST_NAME}.stdout.sorted" << '__OUT__'
diff --git a/tests/flakyfunctional/restart/46-stop-clock-time.t b/tests/flakyfunctional/restart/46-stop-clock-time.t
@@ -21,7 +21,7 @@
 
 dumpdbtables() {
     sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-        'SELECT * FROM workflow_params WHERE key=="stop_clock_time";' \
+        "SELECT * FROM workflow_params WHERE key=='stop_clock_time';" \
         >'stopclocktime.out'
 }
 
diff --git a/tests/functional/cylc-poll/11-event-time.t b/tests/functional/cylc-poll/11-event-time.t
@@ -27,9 +27,9 @@ workflow_run_ok "${TEST_NAME_BASE}" \
 
 RUND="$RUN_DIR/${WORKFLOW_NAME}"
 sed -n 's/CYLC_JOB_EXIT_TIME=//p' "${RUND}/log/job/1/w1/NN/job.status" >'st-time.txt'
-sqlite3 "${RUND}/log/db" '
+sqlite3 "${RUND}/log/db" "
     SELECT time_run_exit FROM task_jobs
-    WHERE cycle=="1" AND name=="w1" AND submit_num=="1"' >'db-time.txt'
+    WHERE cycle=='1' AND name=='w1' AND submit_num=='1'" >'db-time.txt'
 run_ok "${TEST_NAME_BASE}-time-run-exit" diff -u 'st-time.txt' 'db-time.txt'
 
 purge
diff --git a/tests/functional/cylc-set/00-set-succeeded.t b/tests/functional/cylc-set/00-set-succeeded.t
@@ -28,12 +28,12 @@ reftest_run
 for TASK in foo bar
 do
     sqlite3 ~/cylc-run/"${WORKFLOW_NAME}"/log/db \
-       "SELECT status FROM task_states WHERE name is \"$TASK\"" > "${TASK}.1"
+       "SELECT status FROM task_states WHERE name is '$TASK'" > "${TASK}.1"
 
     cmp_ok ${TASK}.1 - <<<succeeded
 
     sqlite3 ~/cylc-run/"${WORKFLOW_NAME}"/log/db \
-       "SELECT outputs FROM task_outputs WHERE name is \"$TASK\"" > "${TASK}.2"
+       "SELECT outputs FROM task_outputs WHERE name is '$TASK'" > "${TASK}.2"
 
     cmp_json \
         "check-${TASK}-outputs" \
diff --git a/tests/functional/cylc-set/03-set-failed.t b/tests/functional/cylc-set/03-set-failed.t
@@ -42,7 +42,7 @@ cylc stop --now --now --interval=2 --max-polls=5 "${WORKFLOW_NAME}"
 
 # Check the DB records all the outputs.
 sqlite3 ~/cylc-run/"${WORKFLOW_NAME}"/log/db \
-   "SELECT outputs FROM task_outputs WHERE name is \"foo\"" > db-foo.1
+   "SELECT outputs FROM task_outputs WHERE name is 'foo'" > db-foo.1
 
 # Json string list of outputs from the db may not be ordered correctly.
 python3 - << __END__ > db-foo.2
diff --git a/tests/functional/cylc-set/04-switch.t b/tests/functional/cylc-set/04-switch.t
@@ -28,7 +28,7 @@ reftest_run
 # The branch-point task foo should be recorded as succeeded.
 
 sqlite3 ~/cylc-run/"${WORKFLOW_NAME}"/log/db \
-   "SELECT status FROM task_states WHERE name is \"foo\"" > db-foo.2
+   "SELECT status FROM task_states WHERE name is 'foo'" > db-foo.2
 
 cmp_ok "db-foo.2" - << __OUT__
 succeeded
@@ -40,7 +40,7 @@ __OUT__
 #   submitted, started
 
 sqlite3 ~/cylc-run/"${WORKFLOW_NAME}"/log/db \
-   "SELECT outputs FROM task_outputs WHERE name is \"foo\"" > db-foo.1
+   "SELECT outputs FROM task_outputs WHERE name is 'foo'" > db-foo.1
 
 # Json string list of outputs from the db may not be ordered correctly.
 python3 - << __END__ > db-foo.2
diff --git a/tests/functional/cylc-set/05-expire.t b/tests/functional/cylc-set/05-expire.t
@@ -26,14 +26,14 @@ install_and_validate
 reftest_run
 
 sqlite3 ~/cylc-run/"${WORKFLOW_NAME}"/log/db \
-   "SELECT status FROM task_states WHERE name is \"bar\"" > db-bar.1
+   "SELECT status FROM task_states WHERE name is 'bar'" > db-bar.1
 
 cmp_ok "db-bar.1" - << __OUT__
 expired
 __OUT__
 
 sqlite3 ~/cylc-run/"${WORKFLOW_NAME}"/log/db \
-   "SELECT outputs FROM task_outputs WHERE name is \"bar\"" > db-bar.2
+   "SELECT outputs FROM task_outputs WHERE name is 'bar'" > db-bar.2
 
 cmp_ok "db-bar.2" - << __OUT__
 {"expired": "(manually completed)"}
diff --git a/tests/functional/database/06-task-message.t b/tests/functional/database/06-task-message.t
@@ -27,16 +27,16 @@ workflow_run_ok "${TEST_NAME_BASE}-run" \
 DB_FILE="$RUN_DIR/${WORKFLOW_NAME}/log/db"
 
 NAME='select-task-events.out'
-sqlite3 "${DB_FILE}" '
+sqlite3 "${DB_FILE}" "
     SELECT
         cycle, name, event, message
     FROM
         task_events
     WHERE
-        event GLOB "message *"
+        event GLOB 'message *'
     ORDER BY
         event
-' >"${NAME}"
+" >"${NAME}"
 cmp_ok "${NAME}" <<'__SELECT__'
 1|t1|message critical|You are being critical
 1|t1|message info|You are normal
diff --git a/tests/functional/events/20-workflow-event-handlers.t b/tests/functional/events/20-workflow-event-handlers.t
@@ -37,7 +37,7 @@ workflow_run_ok "${TEST_NAME_BASE}-run" \
     cylc play --reference-test --debug --no-detach ${OPT_SET} "${WORKFLOW_NAME}"
 
 LOGD="$RUN_DIR/${WORKFLOW_NAME}/log"
-WORKFLOW_UUID="$(sqlite3 "${LOGD}/db" 'SELECT value FROM workflow_params WHERE key=="uuid_str"')"
+WORKFLOW_UUID="$(sqlite3 "${LOGD}/db" "SELECT value FROM workflow_params WHERE key=='uuid_str'")"
 LOG_FILE="${LOGD}/scheduler/log"
 grep_ok "\\[('workflow-event-handler-00', 'startup') ret_code\\] 0" "${LOG_FILE}"
 grep_ok "\\[('workflow-event-handler-00', 'startup') out\\] Your ${WORKFLOW_NAME} workflow has a startup event and URL http://myworkflows.com/${WORKFLOW_NAME}.html and workflow-priority as HIGH and workflow-UUID as ${WORKFLOW_UUID}." "${LOG_FILE}"
diff --git a/tests/functional/job-file-trap/00-sigusr1.t b/tests/functional/job-file-trap/00-sigusr1.t
@@ -44,7 +44,7 @@ run_tests() {
     poll_grep_workflow_log 'vacated/USR1'
     sleep 1  # a bit of extra time for workflow db update to complete
     sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-        'SELECT status FROM task_states WHERE name=="t1";' \
+        "SELECT status FROM task_states WHERE name=='t1';" \
         >"${TEST_NAME}-db-t1" 2>'/dev/null'
     grep_ok "^\(submitted\|running\)$" "${TEST_NAME}-db-t1"
     # Start the job again and see what happens
@@ -55,7 +55,7 @@ run_tests() {
     poll_workflow_stopped
     # Test t1 status in DB
     sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-        'SELECT status FROM task_states WHERE name=="t1";' >"${TEST_NAME}-db-t1"
+        "SELECT status FROM task_states WHERE name=='t1';" >"${TEST_NAME}-db-t1"
     cmp_ok "${TEST_NAME}-db-t1" - <<<'succeeded'
     # Test reference
     grep_ok 'WORKFLOW REFERENCE TEST PASSED' "${WORKFLOW_RUN_DIR}/log/scheduler/log"
diff --git a/tests/functional/job-submission/11-garbage-platform-command.t b/tests/functional/job-submission/11-garbage-platform-command.t
@@ -32,7 +32,7 @@ workflow_run_ok "${TEST_NAME_BASE}-run" \
 
 sqlite3 \
     "$RUN_DIR/${WORKFLOW_NAME}/log/db" \
-    'SELECT submit_num,submit_status FROM task_jobs WHERE name=="t1"' \
+    "SELECT submit_num,submit_status FROM task_jobs WHERE name=='t1'" \
     >'sqlite3.out'
 cmp_ok 'sqlite3.out' <<'__OUT__'
 1|1
diff --git a/tests/functional/pre-initial/12-warm-restart.t b/tests/functional/pre-initial/12-warm-restart.t
@@ -48,7 +48,7 @@ cylc stop --max-polls=10 --interval=2 "${WORKFLOW_NAME}"
 DB_FILE="${RUN_DIR}/${WORKFLOW_NAME}/log/db"
 NAME='database-entry'
 sqlite3 "${DB_FILE}" \
-    'SELECT value FROM workflow_params WHERE key=="startcp"' >"${NAME}"
+    "SELECT value FROM workflow_params WHERE key=='startcp'" >"${NAME}"
 cmp_ok "${NAME}" <<<'20130101T12'
 #-------------------------------------------------------------------------------
 purge
diff --git a/tests/functional/reload/10-runahead.t b/tests/functional/reload/10-runahead.t
@@ -30,7 +30,7 @@ run_fail "${TEST_NAME}" cylc play --debug --no-detach "${WORKFLOW_NAME}"
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-check-fail
 DB_FILE="$RUN_DIR/${WORKFLOW_NAME}/log/db"
-QUERY='SELECT COUNT(*) FROM task_states WHERE status == "failed"'
+QUERY="SELECT COUNT(*) FROM task_states WHERE status == 'failed'"
 cmp_ok <(sqlite3 "$DB_FILE" "$QUERY") <<< "4"
 #-------------------------------------------------------------------------------
 purge
diff --git a/tests/functional/remote/00-basic.t b/tests/functional/remote/00-basic.t
@@ -36,7 +36,7 @@ workflow_run_ok "${TEST_NAME}" cylc play --reference-test --debug --no-detach "$
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-platform
 sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-    'select platform_name from task_jobs where name=="foo"' >'foo-host.txt'
+    "SELECT platform_name FROM task_jobs WHERE name=='foo'" >'foo-host.txt'
 cmp_ok 'foo-host.txt' <<<"${CYLC_TEST_PLATFORM}"
 #-------------------------------------------------------------------------------
 # Check that the remote job has actually been run on the correct remote by
diff --git a/tests/functional/restart/08-stop-after-cycle-point.t b/tests/functional/restart/08-stop-after-cycle-point.t
@@ -22,7 +22,7 @@
 
 dumpdbtables() {
     sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-        'SELECT value FROM workflow_params WHERE key=="stopcp";' > db_stopcp.out
+        "SELECT value FROM workflow_params WHERE key=='stopcp';" > db_stopcp.out
     sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
         'SELECT cycle, name, status FROM task_pool ORDER BY cycle, name;' > db_taskpool.out.out
 }
diff --git a/tests/functional/restart/13-bad-job-host.t b/tests/functional/restart/13-bad-job-host.t
@@ -28,7 +28,7 @@ workflow_run_ok "${TEST_NAME_BASE}-run" cylc play --debug --no-detach --abort-if
 CYLC_WORKFLOW_RUN_DIR="$RUN_DIR/${WORKFLOW_NAME}"
 for DB_NAME in 'log/db' '.service/db'; do
     sqlite3 "${CYLC_WORKFLOW_RUN_DIR}/${DB_NAME}" \
-        'UPDATE task_jobs SET platform_name="garbage" WHERE name=="t-remote";'
+        "UPDATE task_jobs SET platform_name='garbage' WHERE name=='t-remote';"
 done
 workflow_run_fail "${TEST_NAME_BASE}-restart" cylc play --debug --no-detach --abort-if-any-task-fails "${WORKFLOW_NAME}"
 grep_ok PlatformLookupError "${CYLC_WORKFLOW_RUN_DIR}/log/scheduler/log"
diff --git a/tests/functional/restart/20-event-retry.t b/tests/functional/restart/20-event-retry.t
@@ -24,7 +24,7 @@ WORKFLOWD="$RUN_DIR/${WORKFLOW_NAME}"
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${WORKFLOW_NAME}"
 workflow_run_ok "${TEST_NAME_BASE}-run" cylc play "${WORKFLOW_NAME}" --debug --no-detach
 sqlite3 "${WORKFLOWD}/log/db" \
-    'SELECT COUNT(*) FROM task_action_timers WHERE ctx_key GLOB "*event-handler-00*"' \
+    "SELECT COUNT(*) FROM task_action_timers WHERE ctx_key GLOB '*event-handler-00*'" \
     >"${TEST_NAME_BASE}-db-n-entries"
 cmp_ok "${TEST_NAME_BASE}-db-n-entries" <<<'1'
 workflow_run_ok "${TEST_NAME_BASE}-restart" cylc play "${WORKFLOW_NAME}" --debug --no-detach
diff --git a/tests/functional/restart/26-remote-kill.t b/tests/functional/restart/26-remote-kill.t
@@ -24,7 +24,7 @@ install_workflow "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${WORKFLOW_NAME}"
 workflow_run_ok "${TEST_NAME_BASE}-run" cylc play "${WORKFLOW_NAME}" --debug --no-detach
 sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-    'SELECT status FROM task_pool WHERE cycle=="1" AND NAME=="t1"' \
+    "SELECT status FROM task_pool WHERE cycle=='1' AND NAME=='t1'" \
         >'t1-status.out'
 cmp_ok 't1-status.out' <<<'running'
 run_ok "${TEST_NAME_BASE}-restart" cylc play "${WORKFLOW_NAME}"
@@ -35,7 +35,7 @@ cylc kill "${WORKFLOW_NAME}//1/t1"
 poll_workflow_stopped
 
 sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-    'SELECT status FROM task_pool WHERE cycle=="1" AND NAME=="t1"' \
+    "SELECT status FROM task_pool WHERE cycle=='1' AND NAME=='t1'" \
         >'t1-status.out'
 cmp_ok 't1-status.out' <<<'failed'
 purge
diff --git a/tests/functional/restart/30-outputs.t b/tests/functional/restart/30-outputs.t
@@ -27,7 +27,7 @@ install_workflow "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${WORKFLOW_NAME}"
 workflow_run_ok "${TEST_NAME_BASE}-run" cylc play --no-detach "${WORKFLOW_NAME}"
 sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-    'SELECT outputs FROM task_outputs WHERE name IS "t1"' >'sqlite3.out'
+    "SELECT outputs FROM task_outputs WHERE name IS 't1'" >'sqlite3.out'
 cmp_json 'sqlite3.out' 'sqlite3.out' <<<'{"submitted": "submitted", "started": "started", "succeeded": "succeeded", "hello": "hi there"}'
 
 sqlite3 "${WORKFLOW_RUN_DIR}/log/db" 'SELECT * FROM task_pool' >'task-pool.out'
diff --git a/tests/functional/restart/33-simulation.t b/tests/functional/restart/33-simulation.t
@@ -15,10 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
-# Test cylc/cylc-flow#2788
+# Test https://github.com/cylc/cylc-flow/issues/2788
 . "$(dirname "$0")/test_header"
 
-set_test_number 3
+set_test_number 5
 init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [scheduler]
     cycle point format = %Y
@@ -38,10 +38,10 @@ run_ok "${TEST_NAME_BASE}-validate" cylc validate "${WORKFLOW_NAME}"
 workflow_run_ok "${TEST_NAME_BASE}-run" \
     cylc play --no-detach --stopcp=2019 --mode=simulation --abort-if-any-task-fails "${WORKFLOW_NAME}"
 # Force a waiting task into a running task
-sqlite3 "${HOME}/cylc-run/${WORKFLOW_NAME}/.service/db" \
-    'UPDATE task_states SET status="running" WHERE name=="t1" AND cycle=="2019"'
-sqlite3 "${HOME}/cylc-run/${WORKFLOW_NAME}/.service/db" \
-    'UPDATE task_pool SET status="running" WHERE name=="t1" AND cycle=="2019"'
+run_ok "${TEST_NAME_BASE}-sql1" sqlite3 "${HOME}/cylc-run/${WORKFLOW_NAME}/.service/db" \
+    "UPDATE task_states SET status='running' WHERE name=='t1' AND cycle=='2019'"
+run_ok "${TEST_NAME_BASE}-sql1" sqlite3 "${HOME}/cylc-run/${WORKFLOW_NAME}/.service/db" \
+    "UPDATE task_pool SET status='running' WHERE name=='t1' AND cycle=='2019'"
 workflow_run_ok "${TEST_NAME_BASE}-restart" \
     cylc play --debug --no-detach --fcp=2020 --mode=simulation --abort-if-any-task-fails "${WORKFLOW_NAME}"
 purge
diff --git a/tests/functional/restart/45-stop-task.t b/tests/functional/restart/45-stop-task.t
@@ -21,7 +21,7 @@
 
 dumpdbtables() {
     sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-        'SELECT value FROM workflow_params WHERE key=="stop_task";' >'stoptask.out'
+        "SELECT value FROM workflow_params WHERE key=='stop_task';" >'stoptask.out'
     sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
         'SELECT cycle, name, status FROM task_pool ORDER BY cycle, name;' >'taskpool.out'
 }
diff --git a/tests/functional/restart/51-final-point-reload.t b/tests/functional/restart/51-final-point-reload.t
@@ -21,9 +21,9 @@
 
 dumpdbtables() {
     sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-        'SELECT * FROM workflow_params WHERE key=="fcp";' >'fcp.out'
+        "SELECT * FROM workflow_params WHERE key=='fcp';" >'fcp.out'
     sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-        'SELECT cycle, name, status FROM task_pool ORDER BY cycle, name;' >'taskpool.out'
+        "SELECT cycle, name, status FROM task_pool ORDER BY cycle, name;" >'taskpool.out'
 }
 
 set_test_number 13
diff --git a/tests/functional/restart/52-cycle-point-time-zone.t b/tests/functional/restart/52-cycle-point-time-zone.t
@@ -43,7 +43,7 @@ cylc stop "${WORKFLOW_NAME}"
 poll_workflow_stopped
 
 sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \
-    'SELECT * FROM workflow_params WHERE key=="cycle_point_tz";' > 'dump.out'
+    "SELECT * FROM workflow_params WHERE key=='cycle_point_tz';" > 'dump.out'
 cmp_ok 'dump.out' <<< 'cycle_point_tz|+0100'
 
 # Simulate DST change
diff --git a/tests/functional/runahead/04-no-final-cycle.t b/tests/functional/runahead/04-no-final-cycle.t
@@ -30,7 +30,7 @@ run_fail "${TEST_NAME}" cylc play --debug --no-detach "${WORKFLOW_NAME}"
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-check-fail
 DB="$RUN_DIR/${WORKFLOW_NAME}/log/db"
-TASKS=$(sqlite3 "${DB}" 'select count(*) from task_states where status=="failed"')
+TASKS=$(sqlite3 "${DB}" "SELECT COUNT(*) FROM task_states WHERE status=='failed'")
 # manual comparison for the test
 if ((TASKS==2)); then
     ok "${TEST_NAME}"

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`dumpdbtables() {`
`23`	`23`	`sqlite3 "${WORKFLOW_RUN_DIR}/log/db" \`
`24`		`- 'SELECT * FROM workflow_params WHERE key=="stop_clock_time";' \`
	`24`	`+ "SELECT * FROM workflow_params WHERE key=='stop_clock_time';" \`
`25`	`25`	`>'stopclocktime.out'`
`26`	`26`	`}`
`27`	`27`