From a13bfbacf27d09f7c8ea6b4b559b0980ee8957b9 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 7 Mar 2018 16:30:10 +0100
Subject: make -N --raw --batch the default arguments to mysql, explicitely
 override them if required

---
 lib/common-functions |  2 +-
 lib/mysql-functions  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/common-functions b/lib/common-functions
index 0f75cb8..c7a64fe 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -501,7 +501,7 @@ remove_old_package_versions() {
       "$(printf '%s' "${repository}" | base64 -w0)"
     printf ';\n'
   } | \
-    mysql_run_query -N --raw --batch | \
+    mysql_run_query | \
     tr '\t' ' ' | \
     expand_version 4 | \
     sort -k4V,4 -k3r,3 | \
diff --git a/lib/mysql-functions b/lib/mysql-functions
index 9d705d2..26d3db8 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -26,17 +26,17 @@ base64_encode_each() {
 # wrapper function to query mysql
 mysql_run_query() {
   if [ -s "${work_dir}/build-master-sanity" ]; then
-    ${mysql_command} "$@"
+    ${mysql_command} -N --raw --batch "$@"
   else
     {
-      printf '%s %s: ' "$0" "${mysql_command} $*"
+      printf '%s %s: ' "$0" "${mysql_command} -N --raw --batch $*"
       date
     } \
       | tee -a "${work_dir}/mysql.stdin" \
       | tee -a "${work_dir}/mysql.stdout" \
       >> "${work_dir}/mysql.stderr"
     tee -a "${work_dir}/mysql.stdin" \
-      | ${mysql_command} "$@" \
+      | ${mysql_command} -N --raw --batch "$@" \
       2>> "${work_dir}/mysql.stderr" \
       | tee -a "${work_dir}/mysql.stdout"
     for s in \
@@ -193,7 +193,7 @@ mysql_show_binary_package() {
       s|, FROM| FROM|g
       s|AND;|;|g
     ' | \
-    mysql_run_query --html
+    mysql_run_query --html --column-names
 }
 
 # mysql_add_install_target $install_target
@@ -693,7 +693,7 @@ mysql_sanity_check() {
       'a' 'b'
     printf ';\n'
   } | \
-    mysql_run_query -N --raw --batch | \
+    mysql_run_query | \
     sed '
       s,^,<font color="#FF0000">,
       s,$,</font>,
@@ -723,7 +723,7 @@ mysql_sanity_check() {
       mysql_join_binary_packages_repositories
       printf ' WHERE `repositories`.`is_on_master_mirror`'
     } | \
-      mysql_run_query -N --raw --batch | \
+      mysql_run_query | \
       sed '
         s,\t,/,
         s,\t,-,
@@ -753,7 +753,7 @@ mysql_find_build_assignment_loops() {
       mysql_join_binary_packages_repositories 'packages_dependent' 'repositories_dependent'
       printf ' WHERE `repositories_dependent`.`name`="build-list" AND `repositories_dependency`.`name`="build-list"'
     } | \
-      mysql_run_query -N --raw --batch | \
+      mysql_run_query | \
       tr '\t' ' ' | \
       tsort 2>&1 >/dev/null | \
       sed 's/^tsort:\s*//' | \
@@ -930,7 +930,7 @@ mysql_repair_binary_packages_without_build_assignment() {
     mysql_join_binary_packages_architectures
     printf ' WHERE `binary_packages`.`build_assignment`<0'
   } | \
-    mysql_run_query -N --raw --batch | \
+    mysql_run_query | \
     while read -r id pkgname arch; do
       pkgname=$(
         printf '%s' "${pkgname}" | \
@@ -958,7 +958,7 @@ mysql_repair_binary_packages_without_build_assignment() {
           printf ' WHERE `package_sources`.`pkgbase`=from_base64("%s")' \
             "$(printf '%s' "${pkgname}" | base64 -w0)"
         } | \
-          mysql_run_query -N --raw --batch | \
+          mysql_run_query | \
           grep -qvxF '0'; then
         pkgbase="${pkgname}"
       fi
-- 
cgit v1.2.3