svn commit: r785424 - in /ibatis/trunk/java/tools/ibator/core: build/ doc/ htmldoc/ src/org/apache/ibatis/ibator/api/dom/ src/org/apache/ibatis/ibator/api/dom/java/ test/org/apache/ibatis/ibator/api/
Author: jgbutler
Date: Tue Jun 16 21:55:57 2009
New Revision: 785424
URL: http://svn.apache.org/viewvc?rev=785424view=rev
Log:
[Ibator] Fix for IBATIS-609 - incorrect parsing of Java generic types
Added:
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
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/whatsNew.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/OutputUtilities.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/CompilationUnit.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelEnumeration.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=785424r1=785423r2=785424view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Tue Jun 16
21:55:57 2009
@@ -1,4 +1,4 @@
#Ibator build version info
-#Mon Jun 08 17:15:58 CDT 2009
+#Tue Jun 16 16:44:16 CDT 2009
version=1.2.2
-buildNum=742
+buildNum=744
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=785424r1=785423r2=785424view=diff
==
--- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Tue Jun 16
21:55:57 2009
@@ -11,6 +11,7 @@
3. Fixed NPE and incorrect calculation in generated equals when certain
fields are null - thanks to Benjamin Klatt for finding this bug
4. Fixed IBATIS-601 - improper validation of generatedKey
+5. Fixed IBATIS-609 - incorrect parsing of Java generic types
Enhancements:
1. IBATIS-569 - Make it easier to override IbatorRules in plugins
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=785424r1=785423r2=785424view=diff
==
--- ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Tue Jun 16
21:55:57 2009
@@ -60,6 +60,7 @@
(from EqualsHashCodePlugin) when certain
fields are null - thanks to Benjamin Klatt for finding this bug./li
liIBATIS-601 - improper validation of lt;generatedKeygt;/li
+ liIBATIS-609 - incorrect parsing of Java generic types/li
/ul
h3Enhancements/h3
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/OutputUtilities.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/OutputUtilities.java?rev=785424r1=785423r2=785424view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/OutputUtilities.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/OutputUtilities.java
Tue Jun 16 21:55:57 2009
@@ -15,6 +15,11 @@
*/
package org.apache.ibatis.ibator.api.dom;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
+
/**
* @author Jeff Butler
*/
@@ -75,4 +80,25 @@
public static void newLine(StringBuilder sb) {
sb.append(lineSeparator);
}
+
+/**
+ * returns a unique set of import xxx; Strings for the set of types
+ * @param importedTypes
+ * @return
+ */
+public static SetString calculateImports(SetFullyQualifiedJavaType
importedTypes) {
+StringBuilder sb = new StringBuilder();
+SetString importStrings = new TreeSetString();
+for (FullyQualifiedJavaType fqjt : importedTypes) {
+for (String importString : fqjt.getImportList()) {
+sb.setLength(0);
+sb.append(import ); //$NON-NLS-1$
+
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/ibato
Author: jgbutler
Date: Tue Jun 16 22:13:32 2009
New Revision: 785428
URL: http://svn.apache.org/viewvc?rev=785428view=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=785428r1=785427r2=785428view=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=785428r1=785427r2=785428view=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=785428r1=785427r2=785428view=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 @@
tdThis will translate to: codeCALL IDENTITY()/code/td
/tr
tr
+ th valign=topInformix/th
+ tdThis will translate to: codeselect
dbinfo('sqlca.sqlerrd1') from systables where tabid=1/code/td
+/tr
+tr
thMySql/th
tdThis will translate to: codeSELECT
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=785428r1=785427r2=785428view=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
liFixed addCriterionfor JDBC* methods so that they all do a null
check./li
liFixed IbatorRunner so that configuration errors are shown (thanks to
Karel Rank)/li
+ liIBATIS-605 - Added Informix Dialect for
+ a href=configreference/generatedKey.htmllt;generatedKeygt;/a/li
/ul
h2Version 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=785428r1=785427r2=785428view=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;
