From 4fc2223d442726e1c342a42b09c49491caf80252 Mon Sep 17 00:00:00 2001 From: Yasen Pramatarov Date: Tue, 11 Jun 2024 14:27:09 +0300 Subject: [PATCH] Fixes sqlite db schema checks. --- jilo | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jilo b/jilo index a18cc5a..5ba0682 100755 --- a/jilo +++ b/jilo @@ -157,7 +157,7 @@ check_requirements # normalize DB schemas for Sqlite3 and MySQL/MariaDB in order to compare them when needed db_normalize_schema() { - echo "$1" | tr -d '\n' | tr -s ' ' | tr ',' '\n' | sort + echo "$1" | tr -d '\n' | tr -s ' ' | tr ',' '\n' | tr -d ';' | sort } # execute a query and return the result @@ -524,7 +524,8 @@ case "$cmd" in fi # get current and expected db schemas in comparable format - current_db_schema=$(sqlite3 "$DB" .schema) + #current_db_schema=$(sqlite3 "$DB" .schema) + current_db_schema=$(sqlite3 "$DB" "SELECT sql FROM sqlite_master WHERE type='table' AND name!='sqlite_sequence';") current_db_schema_normalized=$(db_normalize_schema "$current_db_schema") expected_db_schema_normalized=$(db_normalize_schema "$db_create")