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

BUG: like queries in mariadb

parent 6cdcaa4c
No related branches found
No related tags found
No related merge requests found
#!/bin/bash
#
# ** header v3.0
# This file is a part of the CaosDB Project.
#
# Copyright (C) 2018 Research Group Biomedical Physics,
# Max-Planck-Institute for Dynamics and Self-Organization Göttingen
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
# ** end header
#
# new insertEntity procedure, new anonymous role
# Update mysql schema to version v2.1.0
NEW_VERSION="v2.1.1"
OLD_VERSION="v2.1.0"
if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
# just update procedures
update_version $NEW_VERSION
success
......@@ -24,7 +24,7 @@
DROP FUNCTION IF EXISTS db_2_0.getDateTimeWhereClause;
DELIMITER //
CREATE FUNCTION db_2_0.getDateTimeWhereClause(vDateTime VARCHAR(255), operator CHAR(2)) RETURNS VARCHAR(20000) DETERMINISTIC
CREATE FUNCTION db_2_0.getDateTimeWhereClause(vDateTime VARCHAR(255), operator CHAR(4)) RETURNS VARCHAR(20000) DETERMINISTIC
BEGIN
DECLARE sep_loc INTEGER DEFAULT LOCATE('--',vDateTime);
DECLARE vDateTimeLow VARCHAR(255) DEFAULT IF(sep_loc != 0, SUBSTRING_INDEX(vDateTime, '--',1), vDateTime);
......@@ -48,7 +48,7 @@ DELIMITER ;
DROP FUNCTION IF EXISTS db_2_0.constructDateTimeWhereClauseForColumn;
DELIMITER //
CREATE FUNCTION db_2_0.constructDateTimeWhereClauseForColumn(seconds_col VARCHAR(255), nanos_col VARCHAR(255), vDateTimeSecLow VARCHAR(255), vDateTimeNSLow VARCHAR(255), vDateTimeSecUpp VARCHAR(255), vDateTimeNSUpp VARCHAR(255), operator CHAR(2)) RETURNS VARCHAR(20000) DETERMINISTIC
CREATE FUNCTION db_2_0.constructDateTimeWhereClauseForColumn(seconds_col VARCHAR(255), nanos_col VARCHAR(255), vDateTimeSecLow VARCHAR(255), vDateTimeNSLow VARCHAR(255), vDateTimeSecUpp VARCHAR(255), vDateTimeNSUpp VARCHAR(255), operator CHAR(4)) RETURNS VARCHAR(20000) DETERMINISTIC
BEGIN
DECLARE isInterval BOOLEAN DEFAULT vDateTimeSecUpp IS NOT NULL or vDateTimeNSUpp IS NOT NULL;
......@@ -103,7 +103,7 @@ DELIMITER ;
DROP FUNCTION IF EXISTS db_2_0.getDateWhereClause;
DELIMITER //
CREATE FUNCTION db_2_0.getDateWhereClause(vDateTimeDotNotation VARCHAR(255), operator CHAR(2)) RETURNS VARCHAR(20000) DETERMINISTIC
CREATE FUNCTION db_2_0.getDateWhereClause(vDateTimeDotNotation VARCHAR(255), operator CHAR(4)) RETURNS VARCHAR(20000) DETERMINISTIC
BEGIN
DECLARE isInterval INTEGER DEFAULT LOCATE('--',vDateTimeDotNotation);
DECLARE vILB VARCHAR(255) DEFAULT IF(isInterval != 0, SUBSTRING_INDEX(vDateTimeDotNotation, '--', 1), vDateTimeDotNotation);
......
......@@ -24,7 +24,7 @@
DROP FUNCTION IF EXISTS db_2_0.getDoubleWhereClause;
DELIMITER //
CREATE FUNCTION db_2_0.getDoubleWhereClause(value DOUBLE, unit_sig BIGINT, valueStdUnit DECIMAL(65,30), stdUnit_sig BIGINT, o CHAR(3)) RETURNS VARCHAR(20000) DETERMINISTIC
CREATE FUNCTION db_2_0.getDoubleWhereClause(value DOUBLE, unit_sig BIGINT, valueStdUnit DECIMAL(65,30), stdUnit_sig BIGINT, o CHAR(4)) RETURNS VARCHAR(20000) DETERMINISTIC
BEGIN
RETURN IF(unit_sig IS NULL AND value IS NOT NULL,
CONCAT('subdata.value', o, '\'', value, '\''), #-- without unit but value must not be NULL
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment