svn commit: r785428 - in /ibatis/trunk/java/tools/ibator/core: build/version.properties doc/ReleaseNotes.txt htmldoc/configreference/generatedKey.html htmldoc/whatsNew.html src/org/apache/ibatis/ibator/internal/db/DatabaseDialects.java

[jgbutler]

Author: jgbutler
Date: Tue Jun 16 22:13:32 2009
New Revision: 785428

URL: http://svn.apache.org/viewvc?rev=785428&view=rev
Log:
[Ibator] Fix for IBATIS-605 - Informix Dialect

Modified:
    ibatis/trunk/java/tools/ibator/core/build/version.properties
    ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
    
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/generatedKey.html
    ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
    
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseDialects.java

Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/version.properties?rev=785428&r1=785427&r2=785428&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Tue Jun 16 
22:13:32 2009
@@ -1,4 +1,4 @@
 #Ibator build version info
-#Tue Jun 16 16:44:16 CDT 2009
+#Tue Jun 16 17:01:10 CDT 2009
 version=1.2.2
-buildNum=744
+buildNum=745

Modified: ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt?rev=785428&r1=785427&r2=785428&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Tue Jun 16 
22:13:32 2009
@@ -33,6 +33,7 @@
     change the XML merger so that the XML ids no longer need to contain
     the prefix "ibatorgenerated_"
 15. Many refactorings to make way for iBATIS3
+16. IBATIS-605 - Added Informix Dialect
 
 -------------------------------------------------------------------------------
 Version 1.2.1:

Modified: 
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/generatedKey.html
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/generatedKey.html?rev=785428&r1=785427&r2=785428&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/generatedKey.html 
(original)
+++ 
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/generatedKey.html 
Tue Jun 16 22:13:32 2009
@@ -62,6 +62,10 @@
               <td>This will translate to: <code>CALL IDENTITY()</code></td>
             </tr>
             <tr>
+              <th valign="top">Informix</th>
+              <td>This will translate to: <code>select 
dbinfo('sqlca.sqlerrd1') from systables where tabid=1</code></td>
+            </tr>
+            <tr>
               <th>MySql</th>
               <td>This will translate to: <code>SELECT 
LAST_INSERT_ID()</code></td>
             </tr>

Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html?rev=785428&r1=785427&r2=785428&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Tue Jun 16 
22:13:32 2009
@@ -105,6 +105,8 @@
       plugins.</li>
   <li>Fixed addCriterionfor JDBC* methods so that they all do a null 
check.</li>
   <li>Fixed IbatorRunner so that configuration errors are shown (thanks to 
Karel Rank)</li>
+  <li>IBATIS-605 - Added Informix Dialect for
+      <a href="configreference/generatedKey.html">&lt;generatedKey&gt;</a></li>
 </ul>
 
 <h2>Version 1.2.1</h2>

Modified: 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseDialects.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseDialects.java?rev=785428&r1=785427&r2=785428&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseDialects.java
 (original)
+++ 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseDialects.java
 Tue Jun 16 22:13:32 2009
@@ -29,7 +29,8 @@
     DERBY("VALUES IDENTITY_VAL_LOCAL()"), //$NON-NLS-1$
     HSQLDB("CALL IDENTITY()"), //$NON-NLS-1$
     SYBASE("SELECT @@IDENTITY"), //$NON-NLS-1$
-    DB2_MF("SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1"); //$NON-NLS-1$
+    DB2_MF("SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1"), //$NON-NLS-1$
+    INFORMIX("select dbinfo('sqlca.sqlerrd1') from systables where tabid=1"); 
//$NON-NLS-1$
     
     private String identityRetrievalStatement;
 
@@ -69,6 +70,8 @@
             returnValue = SYBASE;
         } else if ("DB2_MF".equalsIgnoreCase(database)) { //$NON-NLS-1$
             returnValue = DB2_MF;
+        } else if ("Informix".equalsIgnoreCase(database)) { //$NON-NLS-1$
+            returnValue = INFORMIX;
         }
         
         return returnValue;