BUG: backup-script for mariadb

backup.sh

@@ -25,8 +25,9 @@
 #dump a database with all procedures, permissions, structure and data
 
 BACKUPDIR=./backup #The directory which the dump is to be stored to. Do not change it here. Use the --backupdir=./my/dir/ option!
-PRINT_HELP="--backupdir=BACKUPDIR\n\tThe directory which the dump is to be stored to. (Defaults to ./backup)"
+PRINT_HELP="--backupdir=BACKUPDIR\n\tThe directory which the dump is to be stored to. (Defaults to ./backup)\n"
 
+. .config
 # load useful stuff - scans the parameters and so on...
 . patches/utils/patch_header.sh
 
@@ -36,12 +37,12 @@ PRINT_HELP="--backupdir=BACKUPDIR\n\tThe directory which the dump is to be store
 
 
 function backup {
-	# parameters: login-path, database, outfile
+	# parameters: connection, database, outfile
 	if [ -e "$3" ]; then
 		failure "dumpfile already exists."
 	fi
-	echo -n "Dumping database $3 to $4 ... "
-	$CMD_MYSQL_DUMP --opt --default-character-set=utf8 --routines --login-path=$1 $2 > ${3}
+    echo "Dumping database $2 to $3 ... "
+	$CMD_MYSQL_DUMP $1 --opt --default-character-set=utf8 --routines $2 > ${3}
 	success
 }
 
@@ -56,7 +57,7 @@ function backup {
 
 
 DATE=$(date -u --rfc-3339=ns | sed 's/ /T/g')
-BACKUPFILE=${BACKUPDIR}/${DATABASE}.${DATE}.dump.sql
-backup $LOGIN_PATH $DATABASE $BACKUPFILE
+BACKUPFILE=${BACKUPDIR}/${DATABASE_NAME}.${DATE}.dump.sql
+backup $MYSQL_CONNECTION $DATABASE_NAME $BACKUPFILE
 
 

makefile

@@ -57,6 +57,7 @@ _grant:
 		printf "\nPlease repeat the password for $(DATABASE_USER): "; read -s password2; \
 		if [ "$$password" != "$$password2" ]; then printf "\n\nThe passwords didn't match. Try again." ; else break ; fi; \
 	done ; \
+	echo "" ; \
 	for host in $(subst $(comma), ,$(DATABASE_USER_HOST_LIST)); do \
 		$(MYSQL_CMD) $(MYSQL_CONNECTION) -e "CREATE USER '$(DATABASE_USER)'@'$$host' identified by '$$password';"; \
 		$(MYSQL_CMD) $(MYSQL_CONNECTION) -e "GRANT USAGE ON *.* TO '$(DATABASE_USER)'@'$$host';"; \

patches/applyPatches.sh

@@ -30,8 +30,8 @@ export UTILSPATH="./utils"
 
 for p in $PATCHES
 do
-    $p $MYSQL_CONNECTION --database=$DATABASE --patch=$p
+    $p $MYSQL_CONNECTION --database=$DATABASE_NAME --patch=$p
 done
 
 cd ../
-./update_sql_procedures.sh $MYSQL_CONNECTION --database=$DATABASE
+./update_sql_procedures.sh $MYSQL_CONNECTION --database=$DATABASE_NAME

patches/patch20150715-0/patch.sh

@@ -29,14 +29,12 @@ if [ -z "$UTILSPATH" ]; then
 fi
 
 . $UTILSPATH/patch_header.sh 
-
-VERSIONTEST=$(mysql $MYSQL_CONNECTION -D $DATABASE -e "Select CaosDBVersion();" 2>/dev/null || echo "1")
-if [[ "$VERSIONTEST" != "1" ]]; then
+if test ! $(mysql_execute "Select CaosDBVersion();" > /dev/null) ; then
     uptodate
 fi
 
 # install function CaosDBVersion()
-mysql $MYSQL_CONNECTION -D $DATABASE -e "CREATE FUNCTION CaosDBVersion() RETURNS VARCHAR(255) DETERMINISTIC RETURN 'v2.0.0';"
+mysql_execute "CREATE FUNCTION CaosDBVersion() RETURNS VARCHAR(255) DETERMINISTIC RETURN 'v2.0.0';"
 
 # create transaction_log table with new schema
 mysql $MYSQL_CONNECTION -D $DATABASE -e "CREATE TABLE new_transaction_log (

patches/patch20151111-0/patch.sh

@@ -37,29 +37,29 @@ check_version $OLD_VERSION
 dump_table 'datetime_data'
 
 function add_value_ns {
-    $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "ALTER TABLE datetime_data ADD COLUMN value_ns INT UNSIGNED NULL DEFAULT NULL;"
+    mysql_execute "ALTER TABLE datetime_data ADD COLUMN value_ns INT UNSIGNED NULL DEFAULT NULL;"
 }
 
 function add_temp_column {
-    $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "ALTER TABLE datetime_data ADD COLUMN value_temp INT UNSIGNED NULL DEFAULT NULL;"
+    mysql_execute "ALTER TABLE datetime_data ADD COLUMN value_temp INT UNSIGNED NULL DEFAULT NULL;"
 }
 
 function convert_datetime_to_secs {
     leap_secs=('1972-06-30' '1972-12-31' '1973-12-31' '1974-12-31' '1975-12-31' '1976-12-31' '1977-12-31' '1978-12-31' '1979-12-31' '1981-06-30' '1982-06-30' '1983-06-30' '1985-06-30' '1987-12-31' '1989-12-31' '1990-12-31' '1992-06-30' '1993-06-30' '1994-06-30' '1995-12-31' '1997-06-30' '1998-12-31' '2005-12-31' '2008-12-31' '2012-06-30' '2015-06-30')
 #    for l in "${leap_secs[@]}"; do
-#        $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "INSERT INTO datetime_data (domain_id, entity_id, property_id, value, pidx, status) VALUES (0,0,0,'$l 23:59:59',0,'FIX');"
+#        mysql_execute "INSERT INTO datetime_data (domain_id, entity_id, property_id, value, pidx, status) VALUES (0,0,0,'$l 23:59:59',0,'FIX');"
 #    done
-    $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "UPDATE datetime_data SET value_temp=UNIX_TIMESTAMP(value)-7200 WHERE value is not null;"
+    mysql_execute "UPDATE datetime_data SET value_temp=UNIX_TIMESTAMP(value)-7200 WHERE value is not null;"
     
     # add leap second correction
     for l in "${leap_secs[@]}"; do
-        $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "UPDATE datetime_data SET value_temp=value_temp+1 WHERE value>'$l 23:59:59';"
+        mysql_execute "UPDATE datetime_data SET value_temp=value_temp+1 WHERE value>'$l 23:59:59';"
     done
 }
 
 function drop_rename {
-    $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "ALTER TABLE datetime_data DROP COLUMN value;"
-    $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "ALTER TABLE datetime_data CHANGE value_temp value INT UNSIGNED NULL DEFAULT NULL;"
+    mysql_execute "ALTER TABLE datetime_data DROP COLUMN value;"
+    mysql_execute "ALTER TABLE datetime_data CHANGE value_temp value INT UNSIGNED NULL DEFAULT NULL;"
 }
 
 

patches/patch20151218-0/patch.sh

@@ -37,7 +37,7 @@ check_version $OLD_VERSION
 dump_table 'datetime_data'
 
 function add_desc_override_table {
-    $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'CREATE TABLE IF NOT EXISTS desc_overrides (
+    mysql_execute 'CREATE TABLE IF NOT EXISTS desc_overrides (
 	domain_id INT UNSIGNED,
 	entity_id INT UNSIGNED,
 	description VARCHAR(255),

patches/patch20151224-0/patch.sh

@@ -35,8 +35,8 @@ fi
 check_version $OLD_VERSION
 
 function modify_desc_columns {
-    $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE entities MODIFY COLUMN description VARCHAR(65535) NULL DEFAULT NULL;'
-    $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE desc_overrides MODIFY COLUMN description VARCHAR(65535) NULL DEFAULT NULL;'
+    mysql_execute 'ALTER TABLE entities MODIFY COLUMN description TEXT NULL DEFAULT NULL;'
+    mysql_execute 'ALTER TABLE desc_overrides MODIFY COLUMN description TEXT NULL DEFAULT NULL;'
 }
 
 

patches/patch20160111-0/patch.sh

@@ -35,7 +35,7 @@ fi
 check_version $OLD_VERSION
 
 function create_new_table {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'CREATE TABLE name_overrides2 (
+	mysql_execute 'CREATE TABLE name_overrides2 (
 		domain_id INT UNSIGNED,
 		entity_id INT UNSIGNED,
 		property_id INT UNSIGNED,
@@ -46,11 +46,11 @@ function create_new_table {
 		FOREIGN KEY `name_ov_forkey_pro` (`property_id`) REFERENCES `entities` (`id`)
 	) ENGINE=InnoDB;
 	'
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'CREATE TABLE desc_overrides2 (
+	mysql_execute 'CREATE TABLE desc_overrides2 (
 		domain_id INT UNSIGNED,
 		entity_id INT UNSIGNED,
 		property_id INT UNSIGNED,
-		description VARCHAR(65535),
+		description TEXT,
 		INDEX `desc_ov_dom_ent_idx` (domain_id,entity_id),
 		FOREIGN KEY `desc_ov_forkey_dom` (`domain_id`) REFERENCES `entities` (`id`),
 		FOREIGN KEY `desc_ov_forkey_ent` (`entity_id`) REFERENCES `entities` (`id`),
@@ -60,22 +60,22 @@ function create_new_table {
 }
 
 function copy_old {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'INSERT INTO name_overrides2 (domain_id, entity_id, property_id, name) SELECT 0, domain_id, entity_id, name FROM name_overrides;'
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'INSERT INTO desc_overrides2 (domain_id, entity_id, property_id, description) SELECT 0, domain_id, entity_id, description FROM desc_overrides;'
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'UPDATE name_overrides2,reference_data SET name_overrides2.domain_id=reference_data.domain_id WHERE name_overrides2.entity_id=reference_data.entity_id and name_overrides2.property_id=reference_data.value and status="REPLACEMENT" and reference_data.domain_id!=0;'
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'UPDATE desc_overrides2,reference_data SET desc_overrides2.domain_id=reference_data.domain_id WHERE desc_overrides2.entity_id=reference_data.entity_id and desc_overrides2.property_id=reference_data.value and status="REPLACEMENT" and reference_data.domain_id!=0;'
+	mysql_execute 'INSERT INTO name_overrides2 (domain_id, entity_id, property_id, name) SELECT 0, domain_id, entity_id, name FROM name_overrides;'
+	mysql_execute 'INSERT INTO desc_overrides2 (domain_id, entity_id, property_id, description) SELECT 0, domain_id, entity_id, description FROM desc_overrides;'
+	mysql_execute 'UPDATE name_overrides2,reference_data SET name_overrides2.domain_id=reference_data.domain_id WHERE name_overrides2.entity_id=reference_data.entity_id and name_overrides2.property_id=reference_data.value and status="REPLACEMENT" and reference_data.domain_id!=0;'
+	mysql_execute 'UPDATE desc_overrides2,reference_data SET desc_overrides2.domain_id=reference_data.domain_id WHERE desc_overrides2.entity_id=reference_data.entity_id and desc_overrides2.property_id=reference_data.value and status="REPLACEMENT" and reference_data.domain_id!=0;'
 }
 
 function delete_rename {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'DROP TABLE name_overrides;'
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'DROP TABLE desc_overrides;'
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE name_overrides2 RENAME name_overrides;'
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE desc_overrides2 RENAME desc_overrides;'
+	mysql_execute 'DROP TABLE name_overrides;'
+	mysql_execute 'DROP TABLE desc_overrides;'
+	mysql_execute 'ALTER TABLE name_overrides2 RENAME name_overrides;'
+	mysql_execute 'ALTER TABLE desc_overrides2 RENAME desc_overrides;'
 }
 
 function set_idx {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE name_overrides ADD UNIQUE KEY `name_ov_ukey` (domain_id,entity_id,property_id);'
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE desc_overrides ADD UNIQUE KEY `desc_ov_ukey` (domain_id,entity_id,property_id);'
+	mysql_execute 'ALTER TABLE name_overrides ADD UNIQUE KEY `name_ov_ukey` (domain_id,entity_id,property_id);'
+	mysql_execute 'ALTER TABLE desc_overrides ADD UNIQUE KEY `desc_ov_ukey` (domain_id,entity_id,property_id);'
 }
 
 create_new_table

patches/patch20160112-0/patch.sh

@@ -35,7 +35,7 @@ fi
 check_version $OLD_VERSION
 
 function create_new_table {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'CREATE TABLE data_type2 (
+	mysql_execute 'CREATE TABLE data_type2 (
 		domain_id INT UNSIGNED,
 		entity_id INT UNSIGNED,
 		property_id INT UNSIGNED,
@@ -50,17 +50,17 @@ function create_new_table {
 }
 
 function copy_old {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'INSERT INTO data_type2 (domain_id, entity_id, property_id, datatype) SELECT 0, domain_id, entity_id, datatype FROM data_type;'
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'UPDATE data_type2,reference_data SET data_type2.domain_id=reference_data.domain_id WHERE data_type2.entity_id=reference_data.entity_id and data_type2.property_id=reference_data.value and status="REPLACEMENT" and reference_data.domain_id!=0;'
+	mysql_execute 'INSERT INTO data_type2 (domain_id, entity_id, property_id, datatype) SELECT 0, domain_id, entity_id, datatype FROM data_type;'
+	mysql_execute 'UPDATE data_type2,reference_data SET data_type2.domain_id=reference_data.domain_id WHERE data_type2.entity_id=reference_data.entity_id and data_type2.property_id=reference_data.value and status="REPLACEMENT" and reference_data.domain_id!=0;'
 }
 
 function delete_rename {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'DROP TABLE data_type;'
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE data_type2 RENAME data_type;'
+	mysql_execute 'DROP TABLE data_type;'
+	mysql_execute 'ALTER TABLE data_type2 RENAME data_type;'
 }
 
 function set_idx {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE data_type ADD UNIQUE KEY `datatype_ukey` (domain_id,entity_id,property_id);'
+	mysql_execute 'ALTER TABLE data_type ADD UNIQUE KEY `datatype_ukey` (domain_id,entity_id,property_id);'
 }
 
 create_new_table

patches/patch20160113-0/patch.sh

@@ -35,7 +35,7 @@ fi
 check_version $OLD_VERSION
 
 function create_new_table {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'CREATE TABLE enum_data (
+	mysql_execute 'CREATE TABLE enum_data (
 		domain_id INT UNSIGNED,
 		entity_id INT UNSIGNED,
 		property_id INT UNSIGNED,
@@ -51,7 +51,7 @@ function create_new_table {
 }
 
 function add_datatype_boolean {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'INSERT INTO entities (id, name, description, role, acl) VALUES (18,"BOOLEAN","The defaulf boolean data type","DATATYPE",0);'
+	mysql_execute 'INSERT INTO entities (id, name, description, role, acl) VALUES (18,"BOOLEAN","The defaulf boolean data type","DATATYPE",0);'
 }
 
 create_new_table

patches/patch20160114-0/patch.sh

@@ -35,12 +35,12 @@ fi
 check_version $OLD_VERSION
 
 function add_unit_sig_columns {
-    $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE double_data ADD COLUMN unit_sig BIGINT NULL DEFAULT NULL;'
-    $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE integer_data ADD COLUMN unit_sig BIGINT NULL DEFAULT NULL;'
+    mysql_execute 'ALTER TABLE double_data ADD COLUMN unit_sig BIGINT NULL DEFAULT NULL;'
+    mysql_execute 'ALTER TABLE integer_data ADD COLUMN unit_sig BIGINT NULL DEFAULT NULL;'
 }
 
 function create_units_lin_con {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'CREATE TABLE units_lin_con (
+	mysql_execute 'CREATE TABLE units_lin_con (
 	    signature_from BIGINT NOT NULL PRIMARY KEY,
 		signature_to BIGINT NOT NULL,
 		a DECIMAL(65,30) NOT NULL,

patches/patch20160203-0/patch.sh

@@ -35,7 +35,7 @@ fi
 check_version $OLD_VERSION
 
 function create_new_table {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'CREATE TABLE date_data (
+	mysql_execute 'CREATE TABLE date_data (
 		domain_id INT UNSIGNED,
 		entity_id INT UNSIGNED,
 		property_id INT UNSIGNED,

patches/patch20160217-2.0.10/patch.sh

@@ -35,7 +35,7 @@ fi
 check_version $OLD_VERSION
 
 function alter_utc_table {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE `datetime_data` MODIFY COLUMN `value` BIGINT;'
+	mysql_execute 'ALTER TABLE `datetime_data` MODIFY COLUMN `value` BIGINT;'
 }
 
 

patches/patch20160318-2.0.11/patch.sh

@@ -35,7 +35,7 @@ fi
 check_version $OLD_VERSION
 
 function insert_request_log_table {
-$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'CREATE TABLE IF NOT EXISTS request_log (id VARCHAR(255) NOT NULL, date DATETIME NOT NULL, request TEXT, response TEXT, request_header TEXT, response_header TEXT, request_entity TEXT, response_entity TEXT, exceptions TEXT) ENGINE=InnoDB'
+mysql_execute 'CREATE TABLE IF NOT EXISTS request_log (id VARCHAR(255) NOT NULL, date DATETIME NOT NULL, request TEXT, response TEXT, request_header TEXT, response_header TEXT, request_entity TEXT, response_entity TEXT, exceptions TEXT) ENGINE=InnoDB'
 }
 
 

patches/patch20160827-2.0.16/patch.sh

@@ -38,7 +38,7 @@ DELETE_OLD_COLUMNS='ALTER TABLE transaction_log DROP COLUMN date; ALTER TABLE tr
 DELETE_USER_ID_COLUMN='ALTER TABLE transaction_log DROP COLUMN user_id;'
 
 function convert_datetime_to_secs {
-    leap_secs=('1972-06-30' '1972-12-31' '1973-12-31' '1974-12-31' '1975-12-31' '1976-12-31' '1977-12-31' '1978-12-31' '1979-12-31' '1981-06-30' '1982-06-30' '1983-06-30' '1985-06-30' '1987-12-31' '1989-12-31' '1990-12-31' '1992-06-30' '1993-06-30' '1994-06-30' '1995-12-31' '1997-06-30' '1998-12-31' '2005-12-31' '2008-12-31' '2012-06-30' '2015-06-30')
+    leap_secs=('1972-06-30' '1972-12-31' '1973-12-31' '1974-12-31' '1975-12-31' '1976-12-31' '1977-12-31' '1978-12-31' '1979-12-31' '1981-06-30' '1982-06-30' '1983-06-30' '1985-06-30' '1987-12-31' '1989-12-31' '1990-12-31' '1992-06-30' '1993-06-30' '1994-06-30' '1995-12-31' '1997-06-30' '1998-12-31' '2005-12-31' '2008-12-31' '2012-06-30' '2015-06-30', '2016-12-31')
 	
 	# update seconds table
 	mysql_execute 'UPDATE transaction_log set seconds = unix_timestamp(CONCAT(date(date), " ",  time(time-1-100-10000)));'
@@ -48,7 +48,7 @@ function convert_datetime_to_secs {
 
     # add leap second correction
     for l in "${leap_secs[@]}"; do
-        $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "UPDATE transaction_log SET seconds=seconds+1 WHERE seconds>'$l 23:59:59';"
+        mysql_execute "UPDATE transaction_log SET seconds=seconds+1 WHERE seconds>unix_timestamp('$l 23:59:59');"
     done
 }
 

patches/patch20170126-2.0.22/patch.sh

@@ -35,7 +35,7 @@ fi
 
 check_version $OLD_VERSION
 
-mysql_execute 'CREATE TABLE IF NOT EXISTS entity_acl (id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, acl VARBINARY(65525) NOT NULL) ENGINE=InnoDB; INSERT INTO entity_acl (acl) VALUES (""); UPDATE  entity_acl SET id = 0; ALTER TABLE entities ADD CONSTRAINT entity_entity_acl FOREIGN KEY (acl) REFERENCES entity_acl (id); CREATE INDEX entity_acl_acl ON entity_acl (acl);'
+mysql_execute 'CREATE TABLE IF NOT EXISTS entity_acl (id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, acl VARBINARY(65525) NOT NULL) ENGINE=InnoDB; INSERT INTO entity_acl (acl) VALUES (""); UPDATE  entity_acl SET id = 0; ALTER TABLE entities ADD CONSTRAINT entity_entity_acl FOREIGN KEY (acl) REFERENCES entity_acl (id); CREATE INDEX entity_acl_acl ON entity_acl (acl(3072));'
 
 
 update_version $NEW_VERSION

patches/utils/patch_header.sh

@@ -28,13 +28,13 @@ CMD_OPTIONS="options:\n\n-h, --help\n\tShow brief help.\n-l LOGIN_PATH, --login-
 set -e
 
 function _print_help() {
-  printf $USAGE
-  printf $CMD_OPTIONS
+  printf -- "$USAGE"
+  printf -- "$CMD_OPTIONS"
   if [ -n "$PRINT_HELP" ]; then
-    printf $PRINT_HELP
+    printf -- "$PRINT_HELP"
   fi
   if [ -n "$1" ]; then
-    printf $1
+    printf -- "$1"
   fi
 }
 while test $# -gt 0; do
@@ -46,7 +46,7 @@ while test $# -gt 0; do
  -p)
   shift
   if test $# -gt 0; then
-   DBPASSWORD=$1
+   MYSQL_USER_PASSWORD=$1
   else
    echo "no database specified"
    exit 1
@@ -54,13 +54,13 @@ while test $# -gt 0; do
   shift
   ;;
  --password*)
-  DBPASSWORD=`echo $1 | sed -e 's/^[^=]*=//g'`
+  MYSQL_USER_PASSWORD=`echo $1 | sed -e 's/^[^=]*=//g'`
   shift
   ;;
  -u)
   shift
   if test $# -gt 0; then
-   DBUSER=$1
+   MYSQL_USER=$1
   else
    echo "no database specified"
    exit 1
@@ -68,7 +68,7 @@ while test $# -gt 0; do
   shift
   ;;
  --user*)
-  DBUSER=`echo $1 | sed -e 's/^[^=]*=//g'`
+  MYSQL_USER=`echo $1 | sed -e 's/^[^=]*=//g'`
   shift
   ;;
  -l)
@@ -88,7 +88,7 @@ while test $# -gt 0; do
  -d)
   shift
   if test $# -gt 0; then
-   DATABASE=$1
+   DATABASE_NAME=$1
   else
    echo "no database specified"
    exit 1
@@ -96,7 +96,7 @@ while test $# -gt 0; do
   shift
   ;;
  --database*)
-  DATABASE=`echo $1 | sed -e 's/^[^=]*=//g'`
+  DATABASE_NAME=`echo $1 | sed -e 's/^[^=]*=//g'`
   shift
   ;;
  --patch*)
@@ -113,9 +113,9 @@ while test $# -gt 0; do
  esac
 done
 
-if [ -z "$DATABASE" ]
+if [ -z "$DATABASE_NAME" ]
 then
- print_help "Please specify the database."
+ _print_help "Please specify the database."
  exit 1
 fi
 
@@ -124,18 +124,18 @@ then
   MYSQL_CONNECTION="--login-path=$LOGIN_PATH"
 else
   MYSQL_CONNECTION=""
-  if [ "$DBUSER" ]
+  if [ "$MYSQL_USER" ]
   then
-    MYSQL_CONNECTION="--user=$DBUSER"
+    MYSQL_CONNECTION="--user=$MYSQL_USER"
   fi
-  if [ "$DBPASSWORD" ]
+  if [ "$MYSQL_USER_PASSWORD" ]
   then
-    MYSQL_CONNECTION="$MYSQL_CONNECTION --password=$DBPASSWORD"
+    MYSQL_CONNECTION="$MYSQL_CONNECTION --password=$MYSQL_USER_PASSWORD"
   fi
 fi
 
 if [ -n "$PATCH" ]; then
-    echo -ne "applying patch $PATCH to $DATABASE ... "
+    echo -ne "applying patch $PATCH to $DATABASE_NAME ... "
 fi
 
 function success {
@@ -155,7 +155,7 @@ function uptodate {
 # @param $1: db version string, e.g. v2.0.0
 # @return: 0 on success, 1 on failure
 function check_version {
-    local version=$($CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -B -e "Select CaosDBVersion();")
+    local version=$($CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE_NAME -B -e "Select CaosDBVersion();")
 	if [[ "$(echo $version | sed 's/^CaosDBVersion()\s//')" = "$1" ]]; then
         return 0
 	fi
@@ -168,13 +168,13 @@ function update_version {
 }
 
 function dump_table {
-    $CMD_MYSQL_DUMP $MYSQL_CONNECTION $DATABASE $1 > ${DATABASE}.${1}.${OLD_VERSION}.dump.sql
+    $CMD_MYSQL_DUMP $MYSQL_CONNECTION $DATABASE_NAME $1 > ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql
 }
 
 
 function mysql_execute {
 	set +e
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "$1"
+	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE_NAME -e "$1"
 	ret=${PIPESTATUS[0]}
 	if [ "$ret" -ne 0 ]; then
 		failure "MYSQL ERROR"
@@ -183,5 +183,5 @@ function mysql_execute {
 }
 
 function redo_table {
-	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE < ${DATABASE}.${1}.${OLD_VERSION}.dump.sql
+	$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE_NAME < ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql
 }

procedures/insertEntity.sql

@@ -24,7 +24,7 @@
 
 DROP PROCEDURE IF EXISTS db_2_0.insertEntity;
 delimiter //
-CREATE PROCEDURE db_2_0.insertEntity(in EntityName VARCHAR(255), in EntityDesc VARCHAR(65535), in EntityRole VARCHAR(255), in Datatype VARCHAR(255), in Collection VARCHAR(255), in ACL VARBINARY(65525))
+CREATE PROCEDURE db_2_0.insertEntity(in EntityName VARCHAR(255), in EntityDesc TEXT, in EntityRole VARCHAR(255), in Datatype VARCHAR(255), in Collection VARCHAR(255), in ACL VARBINARY(65525))
 BEGIN
     DECLARE NewEntityID INT UNSIGNED DEFAULT NULL;
 	DECLARE NewACLID INT UNSIGNED DEFAULT NULL;

procedures/insertEntityProperty.sql

@@ -23,7 +23,7 @@
 
 DROP PROCEDURE IF EXISTS db_2_0.insertEntityProperty;
 delimiter //
-CREATE PROCEDURE db_2_0.insertEntityProperty(in DomainID INT UNSIGNED, in EntityID INT UNSIGNED, in PropertyID INT UNSIGNED, in Datatable VARCHAR(255), in PropertyValue TEXT, in PropertyUnitSig BIGINT, in PropertyStatus VARCHAR(255), in NameOverride VARCHAR(255), in DescOverride VARCHAR(65535), in datatypeOverride INT UNSIGNED, in Collection VARCHAR(255), in PropertyIndex INT UNSIGNED)
+CREATE PROCEDURE db_2_0.insertEntityProperty(in DomainID INT UNSIGNED, in EntityID INT UNSIGNED, in PropertyID INT UNSIGNED, in Datatable VARCHAR(255), in PropertyValue TEXT, in PropertyUnitSig BIGINT, in PropertyStatus VARCHAR(255), in NameOverride VARCHAR(255), in DescOverride TEXT, in datatypeOverride INT UNSIGNED, in Collection VARCHAR(255), in PropertyIndex INT UNSIGNED)
 BEGIN
 
 	CASE Datatable

procedures/overrideName.sql

@@ -32,7 +32,7 @@ BEGIN
 END;
 //
 
-CREATE PROCEDURE db_2_0.overrideDesc(in DomainID INT UNSIGNED, in EntityID INT UNSIGNED, in PropertyID INT UNSIGNED, in Description VARCHAR(65535))
+CREATE PROCEDURE db_2_0.overrideDesc(in DomainID INT UNSIGNED, in EntityID INT UNSIGNED, in PropertyID INT UNSIGNED, in Description TEXT)
 BEGIN
 	INSERT INTO desc_overrides (domain_id, entity_id, property_id, description) VALUES (DomainID, EntityID, PropertyID, Description);
 END;