--- alx-src/branches/alx-web-070/scripts/sql-schema/mcore-sql-schema.sh	2016/02/05 13:48:23	8497
+++ alx-src/branches/alx-web-070/scripts/sql-schema/mcore-sql-schema.sh	2016/02/05 13:57:48	8498
@@ -279,8 +279,8 @@
 {
 	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 schema version
+	mysqldo "INSERT INTO ${MCORE_SQL_DB}.meta_schema(version) VALUES ('${MCORE_SQL_DB_SCHEMA_VERSION}') ON DUPLICATE KEY UPDATE version='${MCORE_SQL_DB_SCHEMA_VERSION}';" || die "updating schema version"
 }
 
 update_database()
@@ -288,7 +288,7 @@
 	local current_sql_db_schema_version
 	local i
 
-	current_sql_db_schema_version=$(mysqldo "SELECT MAX(schema_version) from meta;")
+	current_sql_db_schema_version=$(mysqldo "SELECT MAX(version) from meta_schema;")
 
 	if [[ ${current_sql_db_schema_version} = ${MCORE_SQL_DB_SCHEMA_VERSION} ]]
 	then
@@ -306,13 +306,27 @@
 		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"
+	# update database schema version
+	mysqldo "INSERT INTO ${MCORE_SQL_DB}.meta_schema(version) VALUES ('${MCORE_SQL_DB_SCHEMA_VERSION}') ON DUPLICATE KEY UPDATE version='${MCORE_SQL_DB_SCHEMA_VERSION}';" || die "updating schema version"
 }
 
 fill_database()
 {
+	local current_sql_db_values_version
+	local i
+
+	current_sql_db_values_version=$(mysqldo "SELECT MAX(version) from meta_values;")
+
+	if [[ ${current_sql_db_values_version} = ${MCORE_SQL_DB_VALUES_VERSION} ]]
+	then
+		echo "Database values are already up to date"
+		return 0
+	fi
+
 	create_database_values
+	# update database values version
+	mysqldo "INSERT INTO ${MCORE_SQL_DB}.meta_values(version) VALUES ('${MCORE_SQL_DB_VALUES_VERSION}') ON DUPLICATE KEY UPDATE version='${MCORE_SQL_DB_VALUES_VERSION}';" || die "updating values version"
+	fi
 }
 
 case $1 in