--- alx-src/branches/alx-web-070/scripts/sql-schema/mcore-sql-schema.sh	2016/02/05 13:30:51	8495
+++ alx-src/branches/alx-web-070/scripts/sql-schema/mcore-sql-schema.sh	2016/02/05 13:45:13	8496
@@ -280,7 +280,7 @@
 	create_database_schema
 
 	# update database version
-	mysqldo "INSERT INTO ${MCORE_SQL_DB}.meta(version) VALUES ('${MCORE_SQL_DB_VERSION}') ON DUPLICATE KEY UPDATE version='${MCORE_SQL_DB_VERSION}';" || die "updating version"
+	mysqldo "INSERT INTO ${MCORE_SQL_DB}.meta(version) VALUES ('${MCORE_SQL_DB_SCHEMA_VERSION}') ON DUPLICATE KEY UPDATE version='${MCORE_SQL_DB_SCHEMA_VERSION}';" || die "updating version"
 }
 
 update_database()
@@ -290,14 +290,14 @@
 
 	current_sql_db_version=$(mysqldo "SELECT MAX(version) from meta;")
 
-	if [[ ${current_sql_db_version} = ${MCORE_SQL_DB_VERSION} ]]
+	if [[ ${current_sql_db_version} = ${MCORE_SQL_DB_SCHEMA_VERSION} ]]
 	then
 		echo "Database is already up to date"
 		return 0
 	fi
 
-	# run every update_to_database_version_X script which exist up to version MCORE_SQL_DB_VERSION
-	for i in $(seq $((${current_sql_db_version}+1)) ${MCORE_SQL_DB_VERSION})
+	# run every update_to_database_version_X script which exist up to version MCORE_SQL_DB_SCHEMA_VERSION
+	for i in $(seq $((${current_sql_db_version}+1)) ${MCORE_SQL_DB_SCHEMA_VERSION})
 	do
 		if [[ -n $(typeset -f update_to_database_schema_version_${i}) ]]
 		then
@@ -307,7 +307,7 @@
 	done
 
 	# update database version
-	mysqldo "INSERT INTO ${MCORE_SQL_DB}.meta(version) VALUES ('${MCORE_SQL_DB_VERSION}') ON DUPLICATE KEY UPDATE version='${MCORE_SQL_DB_VERSION}';" || die "updating version"
+	mysqldo "INSERT INTO ${MCORE_SQL_DB}.meta(version) VALUES ('${MCORE_SQL_DB_SCHEMA_VERSION}') ON DUPLICATE KEY UPDATE version='${MCORE_SQL_DB_SCHEMA_VERSION}';" || die "updating version"
 }
 
 fill_database()