diff --git a/makefile b/makefile
index 9bdd723a09c8f94aca025938fc59d4ac7d2a6d32..1a1fb17229554ecc1d81a4823dbbee9922c8942e 100644
--- a/makefile
+++ b/makefile
@@ -44,6 +44,7 @@ install: _install _grant upgrade
.PHONY: _install
_install:
+ @echo $(MYSQL_CONNECTION)
@if $(MAKE) _exists > /dev/null 2>&1; then \
printf "\n\nA database with with the name \"$(DATABASE_NAME)\" does already exist.\nCall 'make drop-$(DATABASE_NAME)' to delete that database or reconfigure with './configure'.\n"; \
exit 1; \
@@ -57,6 +58,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';"; \
diff --git a/patches/applyPatches.sh b/patches/applyPatches.sh
index 3ef42953835a9f50726aa1f87714467a2e2dd26a..a9928c3772c84ace90871b0a5a3395cbcbd4ffa0 100755
--- a/patches/applyPatches.sh
+++ b/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
diff --git a/patches/patch20150715-0/patch.sh b/patches/patch20150715-0/patch.sh
index e1491136ac3f474bf7ab04cfb1d5b4e43a7ac0a9..1df77d68be6789051b2cb1de7fabbbce049ae2dd 100755
--- a/patches/patch20150715-0/patch.sh
+++ b/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 (
diff --git a/patches/patch20151111-0/patch.sh b/patches/patch20151111-0/patch.sh
index 5cbd0650a751e43442c95ea3f3695ebcd3678197..cb1bdbc45ae07396e0a0158041d0878131a02067 100755
--- a/patches/patch20151111-0/patch.sh
+++ b/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;"
}
diff --git a/patches/patch20151218-0/patch.sh b/patches/patch20151218-0/patch.sh
index 251a4953c656075dc52a2f0804832e945f3770c7..d9ebea9266b90be19552ce2c699096e4e3b75e59 100755
--- a/patches/patch20151218-0/patch.sh
+++ b/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),
diff --git a/patches/patch20151224-0/patch.sh b/patches/patch20151224-0/patch.sh
index 5d0eceeb04cae3ab28a59f2a87d3b7369fbb3840..9eb0bd88bc7e5f3819411f20dca8155425d81496 100755
--- a/patches/patch20151224-0/patch.sh
+++ b/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;'
}
diff --git a/patches/patch20160111-0/patch.sh b/patches/patch20160111-0/patch.sh
index 9f69da49e7fa8d73bdb4cfe5d405d0c2e909cf8f..d3a18f25003f3004fd8ecc2b2d76995a7bc71e5c 100755
--- a/patches/patch20160111-0/patch.sh
+++ b/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
diff --git a/patches/patch20160112-0/patch.sh b/patches/patch20160112-0/patch.sh
index 12ecdf66da3ef1768066719bf85ce1e5f1751117..b153c1e3dfad38c409e155ff0579b1d4749f5534 100755
--- a/patches/patch20160112-0/patch.sh
+++ b/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
diff --git a/patches/patch20160113-0/patch.sh b/patches/patch20160113-0/patch.sh
index 5d1662a6adb115355a06970958adb83028addc5e..6535968e42c51fcdf441ff0360237aaefd2fd63a 100755
--- a/patches/patch20160113-0/patch.sh
+++ b/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
diff --git a/patches/patch20160114-0/patch.sh b/patches/patch20160114-0/patch.sh
index 924d7a663ad2bf7995fb73a2d2bc043c5a0b1000..f5dfa8d74906c94a5233bfb815ed7a77e4903a71 100755
--- a/patches/patch20160114-0/patch.sh
+++ b/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,
diff --git a/patches/patch20160203-0/patch.sh b/patches/patch20160203-0/patch.sh
index f23809d458867b7f647e649430961a45250492fd..7ee4621700075a0a9bd690bd9ba8bbc0b075240f 100755
--- a/patches/patch20160203-0/patch.sh
+++ b/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,
diff --git a/patches/patch20160217-2.0.10/patch.sh b/patches/patch20160217-2.0.10/patch.sh
index 8a451a18e8245fa716150e852fbae6ab4da55378..9a2b32ccdde8bf76cf6d4d95f560d0dd3c4751c4 100755
--- a/patches/patch20160217-2.0.10/patch.sh
+++ b/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;'
}
diff --git a/patches/patch20160318-2.0.11/patch.sh b/patches/patch20160318-2.0.11/patch.sh
index 23c9b6da1162116aa06f6eb77682e90c2a2e4167..edb72c429dcf84a28797a106650c1552c72af1c9 100755
--- a/patches/patch20160318-2.0.11/patch.sh
+++ b/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'
}
diff --git a/patches/patch20160827-2.0.16/patch.sh b/patches/patch20160827-2.0.16/patch.sh
index 71b5c83358102d9cbc3526b909390296fdb215f0..0b2bd441f6e28a30e981385191effb9460b2c0e7 100755
--- a/patches/patch20160827-2.0.16/patch.sh
+++ b/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
}
diff --git a/patches/patch20170126-2.0.22/patch.sh b/patches/patch20170126-2.0.22/patch.sh
index dc693236da3fb37a5bb40d245813ca960d071e2d..243622102450d2e63f2ce9bfb4ecf0d01468365a 100755
--- a/patches/patch20170126-2.0.22/patch.sh
+++ b/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
diff --git a/patches/utils/patch_header.sh b/patches/utils/patch_header.sh
index 3ee4265e445abd2d91b7a449faec38dfef7257e2..1d1881e7965b77229ea4e32c175c1d00e87175de 100644
--- a/patches/utils/patch_header.sh
+++ b/patches/utils/patch_header.sh
@@ -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,7 +54,7 @@ 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)
@@ -128,9 +128,9 @@ else
then
MYSQL_CONNECTION="--user=$DBUSER"
fi
- if [ "$DBPASSWORD" ]
+ if [ "$MYSQL_USER_PASSWORD" ]
then
- MYSQL_CONNECTION="$MYSQL_CONNECTION --password=$DBPASSWORD"
+ MYSQL_CONNECTION="$MYSQL_CONNECTION --password=$MYSQL_USER_PASSWORD"
fi
fi
diff --git a/procedures/insertEntity.sql b/procedures/insertEntity.sql
index cdf0821a9b03f1deb724a479125901a50f01a4e8..2a6b9a60f3fde672e101e06500a63d3635b9f6ba 100644
--- a/procedures/insertEntity.sql
+++ b/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;
diff --git a/procedures/insertEntityProperty.sql b/procedures/insertEntityProperty.sql
index f52e7b5e6cc0b461feeefba30d2acca713c1cd75..796b8922835502fd64113d20f51d4365f9df2905 100644
--- a/procedures/insertEntityProperty.sql
+++ b/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
diff --git a/procedures/overrideName.sql b/procedures/overrideName.sql
index ec9380110949b4426e522712a0be3d4ffce35a5a..2c8c3478c8bd32c802529c8dfaf85c8f277bdbe7 100644
--- a/procedures/overrideName.sql
+++ b/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;
diff --git a/procedures/query/applyPOV.sql b/procedures/query/applyPOV.sql
index 7af0ee89089ec29a224922714b7733a484ab6f78..28c05c8a2016bd183dfa682368a314f009dbde92 100644
--- a/procedures/query/applyPOV.sql
+++ b/procedures/query/applyPOV.sql
@@ -26,7 +26,7 @@ DELIMITER //
CREATE PROCEDURE db_2_0.applyPOV(in sourceSet VARCHAR(255), in targetSet VARCHAR(255), in propertiesTable VARCHAR(255), in refIdsTable VARCHAR(255), in o CHAR(4), in vText VARCHAR(255), in vInt INT, in vDouble DOUBLE, in unit_sig BIGINT, in vDoubleStdUnit DOUBLE, in stdUnit_sig BIGINT, in vDateTime VARCHAR(255), in vDateTimeDotNotation VARCHAR(255), in agg CHAR(3), in pname VARCHAR(255))
POV_LABEL: BEGIN
- DECLARE data VARCHAR(200000) DEFAULT NULL; /*data subselect statement string*/
+ DECLARE data TEXT DEFAULT NULL; /*data subselect statement string*/
DECLARE sTextData VARCHAR(20000) DEFAULT NULL; /*SELECT PREFIX for data subselect plus WHERE CLAUSE for text_data*/
DECLARE sEnumData VARCHAR(20000) DEFAULT NULL; /*WHERE CLAUSE for enum_data*/
DECLARE sIntData VARCHAR(20000) DEFAULT NULL; /*WHERE CLAUSE for integer_data*/
diff --git a/procedures/query/applyTransactionFilter.sql b/procedures/query/applyTransactionFilter.sql
index fb83a1aff49b50e1d663b869a9330c529b572e19..b40b287b25bdd703337d50f3ca19d25d71bfcada 100644
--- a/procedures/query/applyTransactionFilter.sql
+++ b/procedures/query/applyTransactionFilter.sql
@@ -25,7 +25,7 @@ DELIMITER //
CREATE PROCEDURE db_2_0.applyTransactionFilter(in sourceSet VARCHAR(255), targetSet VARCHAR(255), in transaction VARCHAR(255), in operator_u CHAR(2), in realm VARCHAR(255), in userName VARCHAR(255), in ilb BIGINT, in ilb_nanos INT UNSIGNED, in eub BIGINT, in eub_nanos INT UNSIGNED, in operator_t CHAR(2))
BEGIN
- DECLARE data VARCHAR(20000) default CONCAT('(SELECT entity_id FROM transaction_log AS t WHERE t.transaction=\'',
+ DECLARE data TEXT default CONCAT('(SELECT entity_id FROM transaction_log AS t WHERE t.transaction=\'',
transaction,
'\'',
IF(userName IS NOT NULL,
diff --git a/procedures/query/initQuery.sql b/procedures/query/initQuery.sql
index 92fd0ab7ea4fb7b65709bd7b04497f10aef257c8..b233972d2ca7bb72aab768ef5be300273f5ec382 100644
--- a/procedures/query/initQuery.sql
+++ b/procedures/query/initQuery.sql
@@ -34,7 +34,7 @@ DELIMITER //
CREATE PROCEDURE db_2_0.initQuery()
BEGIN
- CREATE TEMPORARY TABLE IF NOT EXISTS warnings (warning VARCHAR(20000) NOT NULL);
+ CREATE TEMPORARY TABLE IF NOT EXISTS warnings (warning TEXT NOT NULL);
call createTmpTable(@resultSet);
SELECT @resultSet as tablename;
diff --git a/procedures/updateEntity.sql b/procedures/updateEntity.sql
index 16afc6f529fdfbeecc963fb234fcc3fa3e703425..7fa903a09fbc486d8428879e95b6c9381f766ff1 100644
--- a/procedures/updateEntity.sql
+++ b/procedures/updateEntity.sql
@@ -31,7 +31,7 @@
DROP PROCEDURE IF EXISTS db_2_0.updateEntity;
delimiter //
-CREATE PROCEDURE db_2_0.updateEntity(in EntityID INT UNSIGNED, in EntityName VARCHAR(255), in EntityDescription VARCHAR(65535), in EntityRole VARCHAR(255), in Datatype VARCHAR(255), in Collection VARCHAR(255), in ACL VARBINARY(65525))
+CREATE PROCEDURE db_2_0.updateEntity(in EntityID INT UNSIGNED, in EntityName VARCHAR(255), in EntityDescription TEXT, in EntityRole VARCHAR(255), in Datatype VARCHAR(255), in Collection VARCHAR(255), in ACL VARBINARY(65525))
BEGIN
DECLARE ACLID INT UNSIGNED DEFAULT NULL;
call entityACL(ACLID, ACL);
diff --git a/update_sql_procedures.sh b/update_sql_procedures.sh
index 89a9051baf503e969e2554b9b409e0fd6fea487e..7b0b457f07456663645c383703e8c1c7ec962291 100755
--- a/update_sql_procedures.sh
+++ b/update_sql_procedures.sh
@@ -29,11 +29,11 @@ source patches/utils/patch_header.sh
echo -n "updating rules ... "
set -e
-mysql_execute "$(sed s/db_2_0/$DATABASE/g rules.sql)"
-echo "[DONE]"
+mysql_execute "$(sed s/db_2_0/$DATABASE_NAME/g rules.sql)"
+echo "[OK]"
echo -n "updating procedures ... "
-mysql_execute "$(sed s/db_2_0/$DATABASE/g procedures/*.sql procedures/query/*.sql)"
+mysql_execute "$(sed s/db_2_0/$DATABASE_NAME/g procedures/*.sql procedures/query/*.sql)"
+success
-echo "[DONE]"