Changeset 3126


Ignore:
Timestamp:
Feb 8, 2007, 3:57:30 PM (15 years ago)
Author:
Johan Enell
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r3116 r3126  
    5353  -->
    5454  <property name="base.majorversion" value="2" />
    55   <property name="base.minorversion" value="2" />
    56   <property name="base.maintenanceversion" value="0" />
     55  <property name="base.minorversion" value="3" />
     56  <property name="base.maintenanceversion" value="0pre" />
    5757  <property name="base.version"
    5858    value="${base.majorversion}.${base.minorversion}.${base.maintenanceversion}" />
  • trunk/src/core/net/sf/basedb/core/HibernateUtil.java

    r2898 r3126  
    440440      if (update)
    441441      {
     442        int currentSchemaVersion = Application.getSchemaVersion();       
     443        if (currentSchemaVersion < 0)
     444        {
     445          throw new BaseException("Couldn't load current schema version of database");
     446        }
     447        else if (Install.NEW_SCHEMA_VERSION < currentSchemaVersion)
     448        {
     449          throw new BaseException("Can't update to schema version " + Install.NEW_SCHEMA_VERSION +
     450              " of database, cause you already have schema version " + currentSchemaVersion + " installed");
     451        }
    442452        // Note! This doesn't create indexes correctly. Use dbIndexes method.
    443453        SchemaUpdate se = new SchemaUpdate(cfg);
Note: See TracChangeset for help on using the changeset viewer.