Changeset 3126

Timestamp:

Feb 8, 2007, 3:57:30 PM (16 years ago)

Author:

Johan Enell

Message:

Merged log:branches/2.2.1#3119:3123 trunk.

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/core/net/sf/basedb/core/HibernateUtil.java (modified) (1 diff)

trunk/build.xml

@@ -53 +53 @@
   -->
   <property name="base.majorversion" value="2" />
-  <property name="base.minorversion" value="2" />
-  <property name="base.maintenanceversion" value="0" />
+  <property name="base.minorversion" value="3" />
+  <property name="base.maintenanceversion" value="0pre" />
   <property name="base.version" 
     value="${base.majorversion}.${base.minorversion}.${base.maintenanceversion}" />

trunk/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);