diff --git a/patches/patch20150715-0/patch.sh b/patches/patch20150715-0/patch.sh index 7a4264e0b708a5a014379e11e215dad4145f7478..3b4e208f74170a08fcddc6ba7ec675fbac81b144 100755 --- a/patches/patch20150715-0/patch.sh +++ b/patches/patch20150715-0/patch.sh @@ -21,7 +21,7 @@ # # ** end header # -# this patch introduces the mysql stored funtion 'LinkAheadVersion' with a initial value of 2.0.0 +# this patch introduces the mysql stored funtion 'CaosDBVersion' with a initial value of 2.0.0 # Update mysql schema to version v2.0.0 if [ -z "$UTILSPATH" ]; then @@ -29,12 +29,12 @@ if [ -z "$UTILSPATH" ]; then fi . $UTILSPATH/patch_header.sh -if test ! $(mysql_execute "Select LinkAheadVersion();" > /dev/null) ; then +if test ! $(mysql_execute "Select CaosDBVersion();" > /dev/null) ; then uptodate fi -# install function LinkAheadVersion() -mysql_execute "CREATE FUNCTION LinkAheadVersion() RETURNS VARCHAR(255) DETERMINISTIC RETURN 'v2.0.0';" +# install function CaosDBVersion() +mysql_execute "CREATE FUNCTION CaosDBVersion() RETURNS VARCHAR(255) DETERMINISTIC RETURN 'v2.0.0';" # create transaction_log table with new schema mysql_execute "CREATE TABLE new_transaction_log ( diff --git a/tests/example.dump.sql b/tests/example.dump.sql index 8490da2585e816f28a6796f154a5dc415a613e48..014e480e7a5423093b2a9f74b14cec4a7e54ad70 100644 --- a/tests/example.dump.sql +++ b/tests/example.dump.sql @@ -896,7 +896,7 @@ UNLOCK TABLES; -- -- Dumping routines for database 'caosdb' -- -/*!50003 DROP FUNCTION IF EXISTS `LinkAheadVersion` */; +/*!50003 DROP FUNCTION IF EXISTS `CaosDBVersion` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -906,7 +906,7 @@ UNLOCK TABLES; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`caosdb`@`%` FUNCTION `LinkAheadVersion`() RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci +CREATE DEFINER=`caosdb`@`%` FUNCTION `CaosDBVersion`() RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci DETERMINISTIC RETURN 'v2.1.1' ;; DELIMITER ; diff --git a/tests/test_autotap.sql b/tests/test_autotap.sql index 76ac84a60a413acf1e480d1355728bbe0e1ca586..ebec7304fd753261775a40a8ccfd8e765136ec0e 100644 --- a/tests/test_autotap.sql +++ b/tests/test_autotap.sql @@ -2272,13 +2272,13 @@ SELECT tap.fk_on_update('_caosdb_schema_unit_tests','entity_version','entity_ver -- FUNCTIONS -- *************************************************************** --- FUNCTION _caosdb_schema_unit_tests.LinkAheadVersion +-- FUNCTION _caosdb_schema_unit_tests.CaosDBVersion -SELECT tap.has_function('_caosdb_schema_unit_tests','LinkAheadVersion',''); -SELECT tap.function_is_deterministic('_caosdb_schema_unit_tests','LinkAheadVersion','YES',''); -SELECT tap.function_data_type_is('_caosdb_schema_unit_tests','LinkAheadVersion','varchar',''); -SELECT tap.function_security_type_is('_caosdb_schema_unit_tests','LinkAheadVersion','DEFINER',''); -SELECT tap.function_sql_data_access_is('_caosdb_schema_unit_tests','LinkAheadVersion','CONTAINS SQL',''); +SELECT tap.has_function('_caosdb_schema_unit_tests','CaosDBVersion',''); +SELECT tap.function_is_deterministic('_caosdb_schema_unit_tests','CaosDBVersion','YES',''); +SELECT tap.function_data_type_is('_caosdb_schema_unit_tests','CaosDBVersion','varchar',''); +SELECT tap.function_security_type_is('_caosdb_schema_unit_tests','CaosDBVersion','DEFINER',''); +SELECT tap.function_sql_data_access_is('_caosdb_schema_unit_tests','CaosDBVersion','CONTAINS SQL',''); -- FUNCTION _caosdb_schema_unit_tests.convert_unit diff --git a/utils/patch_header.sh b/utils/patch_header.sh index 59ba9934e6572ec0f158a451b5c2f4d940885323..76896b067960f67a101bfa3954bbdecb4f41b31d 100644 --- a/utils/patch_header.sh +++ b/utils/patch_header.sh @@ -118,8 +118,8 @@ fi # @param $1: db version string, e.g. v2.0.0 # @return: 0 on success, 1 on failure function check_version { - local version=$($MYSQL_CMD $(get_db_args) -B -e "Select LinkAheadVersion();") - if [[ "$(echo $version | sed 's/^LinkAheadVersion()\s//')" = "$1" ]]; then + local version=$($MYSQL_CMD $(get_db_args) -B -e "Select CaosDBVersion();") + if [[ "$(echo $version | sed 's/^CaosDBVersion()\s//')" = "$1" ]]; then return 0 fi uptodate @@ -127,7 +127,7 @@ function check_version { # @param $1: new version string function update_version { - mysql_execute "DROP FUNCTION IF EXISTS LinkAheadVersion; CREATE FUNCTION LinkAheadVersion() RETURNS VARCHAR(255) DETERMINISTIC RETURN '$1';" + mysql_execute "DROP FUNCTION IF EXISTS CaosDBVersion; CREATE FUNCTION CaosDBVersion() RETURNS VARCHAR(255) DETERMINISTIC RETURN '$1';" } function dump_table {