From: Mike S. <ms...@us...> - 2006-12-01 00:27:57
|
Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24354/Sources/er/extensions Modified Files: ERXSQLHelper.java ERXApplication.java Log Message: frontbase should skip commits in its generated sql and migration should run earlier in the startup process Index: ERXSQLHelper.java =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXSQLHelper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ERXSQLHelper.java 24 Nov 2006 12:35:32 -0000 1.2 --- ERXSQLHelper.java 1 Dec 2006 00:27:52 -0000 1.3 *************** *** 800,804 **** public static class FrontBaseSQLHelper extends ERXSQLHelper { public boolean shouldExecute(String sql) { ! return !sql.startsWith("SET TRANSACTION ISOLATION LEVEL"); } --- 800,811 ---- public static class FrontBaseSQLHelper extends ERXSQLHelper { public boolean shouldExecute(String sql) { ! boolean shouldExecute = true; ! if (sql.startsWith("SET TRANSACTION ISOLATION LEVEL")) { ! shouldExecute = false; ! } ! else if (sql.startsWith("COMMIT")) { ! shouldExecute = false; ! } ! return shouldExecute; } Index: ERXApplication.java =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXApplication.java,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** ERXApplication.java 21 Nov 2006 13:02:24 -0000 1.124 --- ERXApplication.java 1 Dec 2006 00:27:52 -0000 1.125 *************** *** 271,274 **** --- 271,277 ---- public final void finishInitialization(NSNotification n) { finishInitialization(); + if (ERXMigrator.shouldMigrateAtStartup()) { + migrator().migrateToLatest(); + } } *************** *** 282,288 **** */ public final void didFinishLaunching(NSNotification n) { - if (ERXMigrator.shouldMigrateAtStartup()) { - migrator().migrateToLatest(); - } didFinishLaunching(); } --- 285,288 ---- |