Skip to content
Snippets Groups Projects
Unverified Commit f9c86d40 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

ADD anonymous user

parent 96310c75
Branches
Tags
No related merge requests found
Showing
with 54 additions and 54 deletions
...@@ -44,6 +44,7 @@ install: _install _grant upgrade ...@@ -44,6 +44,7 @@ install: _install _grant upgrade
.PHONY: _install .PHONY: _install
_install: _install:
@echo $(MYSQL_CONNECTION)
@if $(MAKE) _exists > /dev/null 2>&1; then \ @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"; \ 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; \ exit 1; \
...@@ -57,6 +58,7 @@ _grant: ...@@ -57,6 +58,7 @@ _grant:
printf "\nPlease repeat the password for $(DATABASE_USER): "; read -s password2; \ 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; \ if [ "$$password" != "$$password2" ]; then printf "\n\nThe passwords didn't match. Try again." ; else break ; fi; \
done ; \ done ; \
echo "" ; \
for host in $(subst $(comma), ,$(DATABASE_USER_HOST_LIST)); do \ 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 "CREATE USER '$(DATABASE_USER)'@'$$host' identified by '$$password';"; \
$(MYSQL_CMD) $(MYSQL_CONNECTION) -e "GRANT USAGE ON *.* TO '$(DATABASE_USER)'@'$$host';"; \ $(MYSQL_CMD) $(MYSQL_CONNECTION) -e "GRANT USAGE ON *.* TO '$(DATABASE_USER)'@'$$host';"; \
......
...@@ -30,8 +30,8 @@ export UTILSPATH="./utils" ...@@ -30,8 +30,8 @@ export UTILSPATH="./utils"
for p in $PATCHES for p in $PATCHES
do do
$p $MYSQL_CONNECTION --database=$DATABASE --patch=$p $p $MYSQL_CONNECTION --database=$DATABASE_NAME --patch=$p
done done
cd ../ cd ../
./update_sql_procedures.sh $MYSQL_CONNECTION --database=$DATABASE ./update_sql_procedures.sh $MYSQL_CONNECTION --database=$DATABASE_NAME
...@@ -29,14 +29,12 @@ if [ -z "$UTILSPATH" ]; then ...@@ -29,14 +29,12 @@ if [ -z "$UTILSPATH" ]; then
fi fi
. $UTILSPATH/patch_header.sh . $UTILSPATH/patch_header.sh
if test ! $(mysql_execute "Select CaosDBVersion();" > /dev/null) ; then
VERSIONTEST=$(mysql $MYSQL_CONNECTION -D $DATABASE -e "Select CaosDBVersion();" 2>/dev/null || echo "1")
if [[ "$VERSIONTEST" != "1" ]]; then
uptodate uptodate
fi fi
# install function CaosDBVersion() # 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 # create transaction_log table with new schema
mysql $MYSQL_CONNECTION -D $DATABASE -e "CREATE TABLE new_transaction_log ( mysql $MYSQL_CONNECTION -D $DATABASE -e "CREATE TABLE new_transaction_log (
......
...@@ -37,29 +37,29 @@ check_version $OLD_VERSION ...@@ -37,29 +37,29 @@ check_version $OLD_VERSION
dump_table 'datetime_data' dump_table 'datetime_data'
function add_value_ns { 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 { 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 { 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')
# for l in "${leap_secs[@]}"; do # 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 # 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 # add leap second correction
for l in "${leap_secs[@]}"; do 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 done
} }
function drop_rename { function drop_rename {
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "ALTER TABLE datetime_data DROP COLUMN value;" mysql_execute "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 CHANGE value_temp value INT UNSIGNED NULL DEFAULT NULL;"
} }
......
...@@ -37,7 +37,7 @@ check_version $OLD_VERSION ...@@ -37,7 +37,7 @@ check_version $OLD_VERSION
dump_table 'datetime_data' dump_table 'datetime_data'
function add_desc_override_table { 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, domain_id INT UNSIGNED,
entity_id INT UNSIGNED, entity_id INT UNSIGNED,
description VARCHAR(255), description VARCHAR(255),
......
...@@ -35,8 +35,8 @@ fi ...@@ -35,8 +35,8 @@ fi
check_version $OLD_VERSION check_version $OLD_VERSION
function modify_desc_columns { function modify_desc_columns {
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE entities MODIFY COLUMN description VARCHAR(65535) NULL DEFAULT NULL;' mysql_execute 'ALTER TABLE entities MODIFY COLUMN description TEXT 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 desc_overrides MODIFY COLUMN description TEXT NULL DEFAULT NULL;'
} }
......
...@@ -35,7 +35,7 @@ fi ...@@ -35,7 +35,7 @@ fi
check_version $OLD_VERSION check_version $OLD_VERSION
function create_new_table { 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, domain_id INT UNSIGNED,
entity_id INT UNSIGNED, entity_id INT UNSIGNED,
property_id INT UNSIGNED, property_id INT UNSIGNED,
...@@ -46,11 +46,11 @@ function create_new_table { ...@@ -46,11 +46,11 @@ function create_new_table {
FOREIGN KEY `name_ov_forkey_pro` (`property_id`) REFERENCES `entities` (`id`) FOREIGN KEY `name_ov_forkey_pro` (`property_id`) REFERENCES `entities` (`id`)
) ENGINE=InnoDB; ) ENGINE=InnoDB;
' '
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'CREATE TABLE desc_overrides2 ( mysql_execute 'CREATE TABLE desc_overrides2 (
domain_id INT UNSIGNED, domain_id INT UNSIGNED,
entity_id INT UNSIGNED, entity_id INT UNSIGNED,
property_id INT UNSIGNED, property_id INT UNSIGNED,
description VARCHAR(65535), description TEXT,
INDEX `desc_ov_dom_ent_idx` (domain_id,entity_id), 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_dom` (`domain_id`) REFERENCES `entities` (`id`),
FOREIGN KEY `desc_ov_forkey_ent` (`entity_id`) REFERENCES `entities` (`id`), FOREIGN KEY `desc_ov_forkey_ent` (`entity_id`) REFERENCES `entities` (`id`),
...@@ -60,22 +60,22 @@ function create_new_table { ...@@ -60,22 +60,22 @@ function create_new_table {
} }
function copy_old { 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;' mysql_execute '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;' mysql_execute '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;' 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;'
$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 '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 { function delete_rename {
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'DROP TABLE name_overrides;' mysql_execute 'DROP TABLE name_overrides;'
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'DROP TABLE desc_overrides;' mysql_execute 'DROP TABLE desc_overrides;'
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE name_overrides2 RENAME name_overrides;' mysql_execute 'ALTER TABLE name_overrides2 RENAME name_overrides;'
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE desc_overrides2 RENAME desc_overrides;' mysql_execute 'ALTER TABLE desc_overrides2 RENAME desc_overrides;'
} }
function set_idx { 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);' mysql_execute '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 desc_overrides ADD UNIQUE KEY `desc_ov_ukey` (domain_id,entity_id,property_id);'
} }
create_new_table create_new_table
......
...@@ -35,7 +35,7 @@ fi ...@@ -35,7 +35,7 @@ fi
check_version $OLD_VERSION check_version $OLD_VERSION
function create_new_table { 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, domain_id INT UNSIGNED,
entity_id INT UNSIGNED, entity_id INT UNSIGNED,
property_id INT UNSIGNED, property_id INT UNSIGNED,
...@@ -50,17 +50,17 @@ function create_new_table { ...@@ -50,17 +50,17 @@ function create_new_table {
} }
function copy_old { 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;' mysql_execute '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 '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 { function delete_rename {
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'DROP TABLE data_type;' mysql_execute 'DROP TABLE data_type;'
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE data_type2 RENAME data_type;' mysql_execute 'ALTER TABLE data_type2 RENAME data_type;'
} }
function set_idx { 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 create_new_table
......
...@@ -35,7 +35,7 @@ fi ...@@ -35,7 +35,7 @@ fi
check_version $OLD_VERSION check_version $OLD_VERSION
function create_new_table { 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, domain_id INT UNSIGNED,
entity_id INT UNSIGNED, entity_id INT UNSIGNED,
property_id INT UNSIGNED, property_id INT UNSIGNED,
...@@ -51,7 +51,7 @@ function create_new_table { ...@@ -51,7 +51,7 @@ function create_new_table {
} }
function add_datatype_boolean { 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 create_new_table
......
...@@ -35,12 +35,12 @@ fi ...@@ -35,12 +35,12 @@ fi
check_version $OLD_VERSION check_version $OLD_VERSION
function add_unit_sig_columns { function add_unit_sig_columns {
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e 'ALTER TABLE double_data ADD COLUMN unit_sig BIGINT NULL DEFAULT NULL;' mysql_execute '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 integer_data ADD COLUMN unit_sig BIGINT NULL DEFAULT NULL;'
} }
function create_units_lin_con { 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_from BIGINT NOT NULL PRIMARY KEY,
signature_to BIGINT NOT NULL, signature_to BIGINT NOT NULL,
a DECIMAL(65,30) NOT NULL, a DECIMAL(65,30) NOT NULL,
......
...@@ -35,7 +35,7 @@ fi ...@@ -35,7 +35,7 @@ fi
check_version $OLD_VERSION check_version $OLD_VERSION
function create_new_table { 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, domain_id INT UNSIGNED,
entity_id INT UNSIGNED, entity_id INT UNSIGNED,
property_id INT UNSIGNED, property_id INT UNSIGNED,
......
...@@ -35,7 +35,7 @@ fi ...@@ -35,7 +35,7 @@ fi
check_version $OLD_VERSION check_version $OLD_VERSION
function alter_utc_table { 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;'
} }
......
...@@ -35,7 +35,7 @@ fi ...@@ -35,7 +35,7 @@ fi
check_version $OLD_VERSION check_version $OLD_VERSION
function insert_request_log_table { 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'
} }
......
...@@ -38,7 +38,7 @@ DELETE_OLD_COLUMNS='ALTER TABLE transaction_log DROP COLUMN date; ALTER TABLE tr ...@@ -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;' DELETE_USER_ID_COLUMN='ALTER TABLE transaction_log DROP COLUMN user_id;'
function convert_datetime_to_secs { 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 # update seconds table
mysql_execute 'UPDATE transaction_log set seconds = unix_timestamp(CONCAT(date(date), " ", time(time-1-100-10000)));' 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 { ...@@ -48,7 +48,7 @@ function convert_datetime_to_secs {
# add leap second correction # add leap second correction
for l in "${leap_secs[@]}"; do 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 done
} }
......
...@@ -35,7 +35,7 @@ fi ...@@ -35,7 +35,7 @@ fi
check_version $OLD_VERSION 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 update_version $NEW_VERSION
......
...@@ -46,7 +46,7 @@ while test $# -gt 0; do ...@@ -46,7 +46,7 @@ while test $# -gt 0; do
-p) -p)
shift shift
if test $# -gt 0; then if test $# -gt 0; then
DBPASSWORD=$1 MYSQL_USER_PASSWORD=$1
else else
echo "no database specified" echo "no database specified"
exit 1 exit 1
...@@ -54,7 +54,7 @@ while test $# -gt 0; do ...@@ -54,7 +54,7 @@ while test $# -gt 0; do
shift shift
;; ;;
--password*) --password*)
DBPASSWORD=`echo $1 | sed -e 's/^[^=]*=//g'` MYSQL_USER_PASSWORD=`echo $1 | sed -e 's/^[^=]*=//g'`
shift shift
;; ;;
-u) -u)
...@@ -128,9 +128,9 @@ else ...@@ -128,9 +128,9 @@ else
then then
MYSQL_CONNECTION="--user=$DBUSER" MYSQL_CONNECTION="--user=$DBUSER"
fi fi
if [ "$DBPASSWORD" ] if [ "$MYSQL_USER_PASSWORD" ]
then then
MYSQL_CONNECTION="$MYSQL_CONNECTION --password=$DBPASSWORD" MYSQL_CONNECTION="$MYSQL_CONNECTION --password=$MYSQL_USER_PASSWORD"
fi fi
fi fi
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
DROP PROCEDURE IF EXISTS db_2_0.insertEntity; DROP PROCEDURE IF EXISTS db_2_0.insertEntity;
delimiter // 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 BEGIN
DECLARE NewEntityID INT UNSIGNED DEFAULT NULL; DECLARE NewEntityID INT UNSIGNED DEFAULT NULL;
DECLARE NewACLID INT UNSIGNED DEFAULT NULL; DECLARE NewACLID INT UNSIGNED DEFAULT NULL;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
DROP PROCEDURE IF EXISTS db_2_0.insertEntityProperty; DROP PROCEDURE IF EXISTS db_2_0.insertEntityProperty;
delimiter // 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 BEGIN
CASE Datatable CASE Datatable
......
...@@ -32,7 +32,7 @@ BEGIN ...@@ -32,7 +32,7 @@ BEGIN
END; 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 BEGIN
INSERT INTO desc_overrides (domain_id, entity_id, property_id, description) VALUES (DomainID, EntityID, PropertyID, Description); INSERT INTO desc_overrides (domain_id, entity_id, property_id, description) VALUES (DomainID, EntityID, PropertyID, Description);
END; END;
......
...@@ -26,7 +26,7 @@ DELIMITER // ...@@ -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)) 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 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 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 sEnumData VARCHAR(20000) DEFAULT NULL; /*WHERE CLAUSE for enum_data*/
DECLARE sIntData VARCHAR(20000) DEFAULT NULL; /*WHERE CLAUSE for integer_data*/ DECLARE sIntData VARCHAR(20000) DEFAULT NULL; /*WHERE CLAUSE for integer_data*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment