diff --git a/patches/applyPatches.sh b/patches/applyPatches.sh index 72754cc8286a89a3c1871d4545add919263dcf02..85bdad86d2fa80d0e304c2a1105ce6ded05257a4 100755 --- a/patches/applyPatches.sh +++ b/patches/applyPatches.sh @@ -47,6 +47,5 @@ do done cd ../ -echo "updating procedures" $UTILSPATH/update_sql_procedures.sh diff --git a/patches/patch20231211-7.0.2/patch.sh b/patches/patch20231211-7.0.2/patch.sh index c9a8c3161cdbf2976f5a56dc295529da7d7c9918..422fc00b9083808446d74776b446c072bdfd73bc 100755 --- a/patches/patch20231211-7.0.2/patch.sh +++ b/patches/patch20231211-7.0.2/patch.sh @@ -34,14 +34,8 @@ fi check_version $OLD_VERSION -echo "version checked" - mysql_execute "UPDATE data_type SET datatype=17 WHERE datatype=3" -echo "updated" - update_version $NEW_VERSION -echo "version updated" - success diff --git a/procedures/entityVersioning.sql b/procedures/entityVersioning.sql index b474d0121130a1695d69616e1de4cc54468b5e64..5adaa4d50c6b8fbafea6319bc4cfb7d2f17bc39e 100644 --- a/procedures/entityVersioning.sql +++ b/procedures/entityVersioning.sql @@ -283,7 +283,7 @@ DROP FUNCTION IF EXISTS db_5_0.get_head_relative // * ---------- * EntityID : VARCHAR(255) * The entity id. - * Offset : INT UNSIGNED + * HeadOffset : INT UNSIGNED * Distance in the sequence of primary parents of the entity. E.g. `0` is the * HEAD itself. `1` is the primary parent of the HEAD. `2` is the primary * parent of the primary parent of the HEAD, and so on. @@ -294,7 +294,7 @@ DROP FUNCTION IF EXISTS db_5_0.get_head_relative // */ CREATE FUNCTION db_5_0.get_head_relative( EntityID VARCHAR(255), - Offset INT UNSIGNED) + HeadOffset INT UNSIGNED) RETURNS VARBINARY(255) READS SQL DATA BEGIN @@ -311,7 +311,7 @@ BEGIN FROM entity_version AS e WHERE e.entity_id = InternalEntityID ORDER BY e._iversion DESC - LIMIT 1 OFFSET Offset + LIMIT 1 OFFSET HeadOffset ); END; // diff --git a/utils/update_sql_procedures.sh b/utils/update_sql_procedures.sh index b9a9e7fe21d1f47b4d7d235ce1a7ac040a060cf3..00069fa3089210911aa65c15f6246a003dd64ff2 100755 --- a/utils/update_sql_procedures.sh +++ b/utils/update_sql_procedures.sh @@ -37,7 +37,7 @@ fi source $UTILSPATH/load_settings.sh source $UTILSPATH/helpers.sh -echo -n "updating procedures ... " +echo "Updating procedures ... " temp_proc_sql=$(mktemp --suffix=.sql) sed -e "s/db_5_0/$DATABASE_NAME/g" procedures/*.sql procedures/query/*.sql \ > "$temp_proc_sql"