From f9c86d404bcd3dd32129d4ffedc67512ccb48cb6 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Mon, 19 Nov 2018 16:30:22 +0100
Subject: [PATCH] ADD anonymous user
---
makefile | 2 ++
patches/applyPatches.sh | 4 ++--
patches/patch20150715-0/patch.sh | 6 ++---
patches/patch20151111-0/patch.sh | 14 +++++------
patches/patch20151218-0/patch.sh | 2 +-
patches/patch20151224-0/patch.sh | 4 ++--
patches/patch20160111-0/patch.sh | 26 ++++++++++-----------
patches/patch20160112-0/patch.sh | 12 +++++-----
patches/patch20160113-0/patch.sh | 4 ++--
patches/patch20160114-0/patch.sh | 6 ++---
patches/patch20160203-0/patch.sh | 2 +-
patches/patch20160217-2.0.10/patch.sh | 2 +-
patches/patch20160318-2.0.11/patch.sh | 2 +-
patches/patch20160827-2.0.16/patch.sh | 4 ++--
patches/patch20170126-2.0.22/patch.sh | 2 +-
patches/utils/patch_header.sh | 8 +++----
procedures/insertEntity.sql | 2 +-
procedures/insertEntityProperty.sql | 2 +-
procedures/overrideName.sql | 2 +-
procedures/query/applyPOV.sql | 2 +-
procedures/query/applyTransactionFilter.sql | 2 +-
procedures/query/initQuery.sql | 2 +-
procedures/updateEntity.sql | 2 +-
update_sql_procedures.sh | 8 +++----
24 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/makefile b/makefile
index 9bdd723..1a1fb17 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 3ef4295..a9928c3 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 e149113..1df77d6 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 5cbd065..cb1bdbc 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 251a495..d9ebea9 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 5d0ecee..9eb0bd8 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 9f69da4..d3a18f2 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 12ecdf6..b153c1e 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 5d1662a..6535968 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 924d7a6..f5dfa8d 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 f23809d..7ee4621 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 8a451a1..9a2b32c 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 23c9b6d..edb72c4 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 71b5c83..0b2bd44 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 dc69323..2436221 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 3ee4265..1d1881e 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 cdf0821..2a6b9a6 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 f52e7b5..796b892 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 ec93801..2c8c347 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 7af0ee8..28c05c8 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 fb83a1a..b40b287 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 92fd0ab..b233972 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 16afc6f..7fa903a 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 89a9051..7b0b457 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]"
--
GitLab