Changeset 3122

Timestamp:

Feb 8, 2007, 12:11:13 PM (16 years ago)

Author:

Martin Svensson

Message:

Fixes #487. Update script must check the schema version before trying to update.

File:

• branches/2.2.1/src/core/net/sf/basedb/core/HibernateUtil.java (modified) (1 diff)

branches/2.2.1/src/core/net/sf/basedb/core/HibernateUtil.java

@@ -440 +440 @@
       if (update)
       {
+        int currentSchemaVersion = Application.getSchemaVersion();        
+        if (currentSchemaVersion < 0)
+        {
+          throw new BaseException("Couldn't load current schema version of database");
+        }
+        else if (Install.NEW_SCHEMA_VERSION < currentSchemaVersion)
+        {
+          throw new BaseException("Can't update to schema version " + Install.NEW_SCHEMA_VERSION + 
+              " of database, cause you already have schema version " + currentSchemaVersion + " installed");
+        }
         // Note! This doesn't create indexes correctly. Use dbIndexes method.
         SchemaUpdate se = new SchemaUpdate(cfg);