[#828] Moved checked_*sql_version

diff --git a/src/bin/admin/admin-utils.sh b/src/bin/admin/admin-utils.sh
index 8ec4b540235567265cd96dbf091b9fa1dbbad2e8..a698640b22b95107adfbb9e85b1f8230a25c23fb 100644 (file)
--- a/src/bin/admin/admin-utils.sh
+++ b/src/bin/admin/admin-utils.sh
@@ -52,6 +52,16 @@ mysql_version() {
     return $?
 }
 
+checked_mysql_version() {
+    mysql_version
+    retcode=$?
+    if [ $retcode -ne 0 ]
+    then
+        printf "Failed to get schema version, mysql status  %s\n" "${retcode}"
+        exit 1
+    fi
+}
+
 # Submits given SQL text to PostgreSQL
 # There are two ways of calling this method.
 # pgsql_execute SQL_QUERY - This call is simpler, but requires db_user,
@@ -105,6 +115,16 @@ pgsql_version() {
     return $?
 }
 
+checked_pgsql_version() {
+    pgsql_version
+    retcode=$?
+    if [ $retcode -ne 0 ]
+    then
+        printf "Failed to get schema version, pgsql status %s\n" "${retcode}"
+        exit 1
+    fi
+}
+
 cql_execute() {
     query=$1
     shift

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 1a77656f65dfa5243183003e95eb845131e02698..ca5f5d7b7454f031aab0fdebf0d96aac23ac6c79 100644 (file)
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -315,26 +315,6 @@ memfile_version() {
     exit 1
 }
 
-checked_mysql_version() {
-    mysql_version
-    ERRCODE=$?
-    if [ $ERRCODE -ne 0 ]
-    then
-        log_error "Failed to get schema version, mysql status = $ERRCODE"
-        exit 1
-    fi
-}
-
-checked_pgsql_version() {
-    pgsql_version
-    ERRCODE=$?
-    if [ $ERRCODE -ne 0 ]
-    then
-        log_error "Failed to get schema version, pgsql status = $ERRCODE"
-        exit 1
-    fi
-}
-
 ### Functions used for upgrade
 memfile_upgrade() {
     # Useless as Kea converts CSV versions at startup.