details: /erp/devel/dbsm-main/rev/aca92c1b661c
changeset: 295:aca92c1b661c
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Apr 28 10:51:59 2010 +0200
summary: Added debug messages for increased information on Function and
Trigger translation
details: /erp/devel/dbsm-main/rev/cdda8c099bb9
changeset: 296:cdda8c099bb9
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Apr 28 11:39:53 2010 +0200
summary: Fixed issue 13030.
Build will be stopped in several cases in which even if there were errors, it
didn't stop.
Fixed issue 13134.
Log will now only output the word error when there is indeed an error in the
execution.
Fixed issue 11019
Messages similar to 'Executed 0 statements with 0 errors' will no longer be
generated.
diffstat:
src/org/apache/ddlutils/platform/PlatformImplBase.java | 17
++++++++-
src/org/apache/ddlutils/platform/postgresql/PostgreSqlModelLoader.java | 2 +
src/org/openbravo/ddlutils/task/AlterDatabaseDataAll.java | 10
++--
src/org/openbravo/ddlutils/task/AlterDatabaseDataMod.java | 14
++++----
4 files changed, 28 insertions(+), 15 deletions(-)
diffs (138 lines):
diff -r a5235fb8138d -r cdda8c099bb9
src/org/apache/ddlutils/platform/PlatformImplBase.java
--- a/src/org/apache/ddlutils/platform/PlatformImplBase.java Wed Apr 14
14:54:10 2010 +0200
+++ b/src/org/apache/ddlutils/platform/PlatformImplBase.java Wed Apr 28
11:39:53 2010 +0200
@@ -367,7 +367,13 @@
}
connection.clearWarnings();
}
- _log.info("Executed " + commandCount + " SQL command(s) with " + errors
+ " error(s)");
+ String errorNumber = "";
+ if (errors > 0)
+ errorNumber = " with " + errors + " error(s)";
+ else
+ errorNumber = " successfully";
+ if (commandCount > 0)
+ _log.info("Executed " + commandCount + " SQL command(s)" +
errorNumber);
// execute the forced commands
int loops = 0;
@@ -400,8 +406,13 @@
errors++;
}
}
- _log.info("Executed " + commandCount + " forced SQL command(s) with "
+ errors
- + " error(s)");
+ String errorNumber2 = "";
+ if (errors > 0)
+ errorNumber2 = " with " + errors + " error(s)";
+ else
+ errorNumber = " successfully";
+ if (commandCount > 0)
+ _log.info("Executed " + commandCount + " forced SQL command(s)" +
errorNumber2);
}
if (!aForcedCommands.isEmpty()) {
diff -r a5235fb8138d -r cdda8c099bb9
src/org/apache/ddlutils/platform/postgresql/PostgreSqlModelLoader.java
--- a/src/org/apache/ddlutils/platform/postgresql/PostgreSqlModelLoader.java
Wed Apr 14 14:54:10 2010 +0200
+++ b/src/org/apache/ddlutils/platform/postgresql/PostgreSqlModelLoader.java
Wed Apr 28 11:39:53 2010 +0200
@@ -77,6 +77,7 @@
PostgrePLSQLStandarization.generateOutPatterns(db);
for (int i = 0; i < db.getFunctionCount(); i++) {
Function f = db.getFunction(i);
+ _log.debug("Translating function: " + f.getName());
f.setOriginalBody(f.getBody());
PostgrePLSQLFunctionStandarization functionStandarization = new
PostgrePLSQLFunctionStandarization(
db, i);
@@ -99,6 +100,7 @@
}
for (int i = 0; i < db.getTriggerCount(); i++) {
Trigger trg = db.getTrigger(i);
+ _log.debug("Translating trigger: " + trg.getName());
trg.setOriginalBody(trg.getBody());
PostgrePLSQLTriggerStandarization triggerStandarization = new
PostgrePLSQLTriggerStandarization(
db, i);
diff -r a5235fb8138d -r cdda8c099bb9
src/org/openbravo/ddlutils/task/AlterDatabaseDataAll.java
--- a/src/org/openbravo/ddlutils/task/AlterDatabaseDataAll.java Wed Apr 14
14:54:10 2010 +0200
+++ b/src/org/openbravo/ddlutils/task/AlterDatabaseDataAll.java Wed Apr 28
11:39:53 2010 +0200
@@ -146,15 +146,15 @@
final Database oldModel = (Database) originaldb.clone();
DBSMOBUtil.setStatus(platform, 14, getLog());
getLog().info("Updating database model...");
- platform.alterTables(originaldb, db, !isFailonerror());
+ platform.alterTables(originaldb, db, false);
getLog().info("Model update complete.");
DBSMOBUtil.setStatus(platform, 15, getLog());
getLog().info("Disabling foreign keys");
final Connection connection = platform.borrowConnection();
- platform.disableAllFK(connection, originaldb, !isFailonerror());
+ platform.disableAllFK(connection, originaldb, true);
getLog().info("Disabling triggers");
- platform.disableAllTriggers(connection, db, !isFailonerror());
+ platform.disableAllTriggers(connection, db, true);
platform.disableNOTNULLColumns(db);
//Executing modulescripts
@@ -173,11 +173,11 @@
getLog().info("Removing invalid rows.");
platform.deleteInvalidConstraintRows(db, !isFailonerror());
getLog().info("Recreating Primary Keys");
- List changes = platform.alterTablesRecreatePKs(oldModel, db,
!isFailonerror());
+ List changes = platform.alterTablesRecreatePKs(oldModel, db, true);
getLog().info("Executing update final script (NOT NULLs and dropping
temporary tables");
platform.executeOnCreateDefaultForMandatoryColumns(db);
platform.enableNOTNULLColumns(db);
- platform.alterTablesPostScript(oldModel, db, !isFailonerror(), changes,
null);
+ platform.alterTablesPostScript(oldModel, db, true, changes, null);
getLog().info("Enabling Foreign Keys and Triggers");
platform.enableAllFK(connection, originaldb, !isFailonerror());
diff -r a5235fb8138d -r cdda8c099bb9
src/org/openbravo/ddlutils/task/AlterDatabaseDataMod.java
--- a/src/org/openbravo/ddlutils/task/AlterDatabaseDataMod.java Wed Apr 14
14:54:10 2010 +0200
+++ b/src/org/openbravo/ddlutils/task/AlterDatabaseDataMod.java Wed Apr 28
11:39:53 2010 +0200
@@ -233,7 +233,7 @@
getLog().info("Updating database model...");
if (row.prefixes.size() > 0)
- platform.alterTables(originaldb, db, !isFailonerror());
+ platform.alterTables(originaldb, db, false);
/*
* StringWriter sw=new StringWriter();
platform.getSqlBuilder().setWriter(sw);
* platform.getSqlBuilder().alterDatabase(originaldb, db, null);
@@ -294,9 +294,9 @@
}
getLog().info("Disabling foreign keys");
final Connection connection = platform.borrowConnection();
- platform.disableAllFK(connection, dbAD, !isFailonerror());
+ platform.disableAllFK(connection, dbAD, true);
getLog().info("Disabling triggers");
- platform.disableAllTriggers(connection, dbAD, !isFailonerror());
+ platform.disableAllTriggers(connection, dbAD, true);
platform.disableNOTNULLColumns(dbXML);
// Executing ModuleScripts
@@ -318,20 +318,20 @@
platform.alterData(connection, dbAD, dataChanges.get(i));
getLog().info("Recreating Primary Keys");
changes.add(platform.alterTablesRecreatePKs(moduleOldModels.get(i),
moduleModels.get(i),
- !isFailonerror()));
+ true));
}
getLog().info("Removing invalid rows.");
platform.deleteInvalidConstraintRows(completedb, !isFailonerror());
for (int i = 0; i < dataChanges.size(); i++) {
getLog().info("Executing update final script (NOT NULLs and dropping
temporary tables)");
- platform.alterTablesPostScript(moduleOldModels.get(i),
moduleModels.get(i), !isFailonerror(),
+ platform.alterTablesPostScript(moduleOldModels.get(i),
moduleModels.get(i), true,
changes.get(i), dbXML);
}
platform.executeOnCreateDefaultForMandatoryColumns(dbXML);
getLog().info("Enabling Foreign Keys and Triggers");
platform.enableNOTNULLColumns(dbXML);
- platform.enableAllFK(connection, dbAD, !isFailonerror());
- platform.enableAllTriggers(connection, dbAD, !isFailonerror());
+ platform.enableAllFK(connection, dbAD, true);
+ platform.enableAllTriggers(connection, dbAD, true);
try {
// execute the post-script
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
