[Openutils-svn] SF.net SVN: openutils: [834] trunk/openutils-dbmigration/src

[<fg...@us...>]

Revision: 834
          http://openutils.svn.sourceforge.net/openutils/?rev=834&view=rev
Author:   fgiust
Date:     2008-06-11 14:18:57 -0700 (Wed, 11 Jun 2008)

Log Message:
-----------
fixed wrong usage of "not" condition in BaseConditionalTask

Modified Paths:
--------------
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java
    trunk/openutils-dbmigration/src/site/changes/changes.xml

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java	2008-06-09 16:48:00 UTC (rev 833)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java	2008-06-11 21:18:57 UTC (rev 834)
@@ -110,7 +110,7 @@
                     {
                         params.put(rsmeta.getColumnName(j), rs.getObject(j));
                     }
-                    conditionMet = !checkColumnMetadata(params);
+                    conditionMet = checkColumnMetadata(params);
                 }
                 rs.close();
                 return conditionMet;

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java	2008-06-09 16:48:00 UTC (rev 833)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java	2008-06-11 21:18:57 UTC (rev 834)
@@ -100,7 +100,7 @@
                 boolean tableExists = rs.next();
                 rs.close();
 
-                return !tableExists;
+                return tableExists;
             }
         });
     }

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java	2008-06-09 16:48:00 UTC (rev 833)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java	2008-06-11 21:18:57 UTC (rev 834)
@@ -97,7 +97,7 @@
                 }
                 rs.close();
 
-                return !fkExists;
+                return fkExists;
             }
         });
     }

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java	2008-06-09 16:48:00 UTC (rev 833)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java	2008-06-11 21:18:57 UTC (rev 834)
@@ -177,7 +177,7 @@
     {
         SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
 
-        if (check(jdbcTemplate) ^ !not)
+        if (check(jdbcTemplate) ^ not)
         {
             log.info("Executing Alter Task: {}", getDescription());
 

Modified: trunk/openutils-dbmigration/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-dbmigration/src/site/changes/changes.xml	2008-06-09 16:48:00 UTC (rev 833)
+++ trunk/openutils-dbmigration/src/site/changes/changes.xml	2008-06-11 21:18:57 UTC (rev 834)
@@ -9,6 +9,9 @@
   </properties>
   <body>
     <release version="2.0.4" date="in svn" description="2.0.4">
+      <action type="fix" dev="fgiust"> Warning: fixed the usage of the "not" condition in
+        it.openutils.migration.task.setup.BaseConditionalTask that previosly caused unexpected (inverted) results. You
+        may need to review your conditional tasks in order to check if the condition is still valid!</action>
       <action type="add" dev="fgiust">New jdbc generic tasks: IfColumnIsNotIdentityConditionalTask,
         JdbcIfColumnIsNotNullableConditionalTask, JdbcIfForeignKeyExistsConditionalTask</action>
       <action type="add" dev="fgiust">New oracle specific tasks: OraclePackageCreationTask,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.