--- alx-src/branches/alx-web-070/scripts/sql-schema/mcore-sql-schema.sh	2016/02/05 13:18:40	8493
+++ alx-src/branches/alx-web-070/scripts/sql-schema/mcore-sql-schema.sh	2016/02/05 13:48:23	8497
@@ -278,30 +278,36 @@
 create_database()
 {
 	create_database_schema
+
+	# update database 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()
 {
-	local current_sql_db_version
+	local current_sql_db_schema_version
 	local i
 
-	current_sql_db_version=$(mysqldo "SELECT MAX(version) from meta;")
+	current_sql_db_schema_version=$(mysqldo "SELECT MAX(schema_version) from meta;")
 
-	if [[ ${current_sql_db_version} = ${MCORE_SQL_DB_VERSION} ]]
+	if [[ ${current_sql_db_schema_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_schema_version}+1)) ${MCORE_SQL_DB_SCHEMA_VERSION})
 	do
-		if [[ -n $(typeset -f update_to_database_version_${i}) ]]
+		if [[ -n $(typeset -f update_to_database_schema_version_${i}) ]]
 		then
 			echo "Running update_to_database_schema_version_${i}()"
-			update_to_database_schema_version_${i}
+			update_to_database_schema_version_${i} || die
 		fi
 	done
+
+	# update database 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()