[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] kexi/tools: Update Kexi tool scripts to work with sqlite3 binaries
From:       Jaroslaw Staniek <staniek () kde ! org>
Date:       2014-04-30 20:46:52
Message-ID: E1WfbP2-0003NK-Hi () scm ! kde ! org
[Download RAW message or body]

Git commit 42b75fe4ca02173653b17855088962d74a8e0afd by Jaroslaw Staniek, on behalf of Gilbert Forkel.
Committed on 30/04/2014 at 20:26.
Pushed by staniek into branch 'master'.

Update Kexi tool scripts to work with sqlite3 binaries

CCMAIL:gilbertforkel@gmail.com

M  +3    -3    kexi/tools/add_column/kexi_add_column
M  +3    -3    kexi/tools/delete_column/kexi_delete_column

http://commits.kde.org/calligra/42b75fe4ca02173653b17855088962d74a8e0afd

diff --git a/kexi/tools/add_column/kexi_add_column b/kexi/tools/add_column/kexi_add_column
index 11f5957..31f1110 100755
--- a/kexi/tools/add_column/kexi_add_column
+++ b/kexi/tools/add_column/kexi_add_column
@@ -50,7 +50,7 @@ function check {
 	[ -n "$*" ] && exit_with_error "$*"
 }
 
-ksqlite="ksqlite -noheader"
+ksqlite="sqlite3 -noheader"
 
 if [ $# -lt 4 ] ; then
 	usage
@@ -86,7 +86,7 @@ msg=`echo "DROP TABLE '$table_name';" | $ksqlite "$temp_db"`
 check "$msg"
 
 # 1. Recreate table with new field appended
-msg=`echo ".schema '$table_name';" | $ksqlite "$database_name" | grep "^CREATE TABLE $table_name " | \
+msg=`echo ".schema '$table_name'" | $ksqlite "$database_name" | grep "^CREATE TABLE $table_name " | \
  sed -e "s/);/, $new_column_name $new_column_type);/g" | $ksqlite "$temp_db"`
 check "$msg"
 
@@ -105,7 +105,7 @@ msg=`echo "INSERT INTO kexi__fields (t_id, f_type, f_name, f_length, f_precision
 check "$msg"
 
 # 3. Copy the old data
-msg=`echo ".dump '$table_name';" | $ksqlite "$database_name" | grep -v "^CREATE TABLE " | \
+msg=`echo ".dump '$table_name'" | $ksqlite "$database_name" | grep -v "^CREATE TABLE " | \
  sed -e "s/\(^INSERT.*\));$/\\1, NULL);/g" | $ksqlite "$temp_db"`
 check "$msg"
 
diff --git a/kexi/tools/delete_column/kexi_delete_column b/kexi/tools/delete_column/kexi_delete_column
index 0fd654b..56b62b8 100755
--- a/kexi/tools/delete_column/kexi_delete_column
+++ b/kexi/tools/delete_column/kexi_delete_column
@@ -46,8 +46,8 @@ function check {
 	[ -n "$*" ] && exit_with_error "$*"
 }
 
-ksqlite="ksqlite -noheader"
-ksqlite_header="ksqlite -header"
+ksqlite="sqlite3 -noheader"
+ksqlite_header="sqlite3 -header"
 
 if [ $# -lt 3 ] ; then
 	usage
@@ -65,7 +65,7 @@ cp "$database_name" "$temp_db" || exit_with_error
 function prepare_new_create_table_statement {
 	# possible problems: typename ( number , number ) may contain ","
 	
-	schema=`echo ".schema '$table_name';" | $ksqlite "$database_name" | \
+	schema=`echo ".schema '$table_name'" | $ksqlite "$database_name" | \
 		grep "^CREATE TABLE $table_name " | \
 		sed -e "s/[^(]*(\(.*\));/\1/" || exit_with_error`
 	
[prev in list] [next in list] [prev in thread] [next in thread]