svn commit: r836404 - in /ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator: api/IntrospectedColumn.java internal/db/DatabaseIntrospector.java

[jgbutler]

Author: jgbutler
Date: Sun Nov 15 20:20:21 2009
New Revision: 836404

URL: http://svn.apache.org/viewvc?rev=836404view=rev
Log:
[ibator] add column default info to introspected column

Modified:

ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedColumn.java

ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java

Modified: 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedColumn.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedColumn.java?rev=836404r1=836403r2=836404view=diff
==
--- 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedColumn.java
 (original)
+++ 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedColumn.java
 Sun Nov 15 20:20:21 2009
@@ -61,6 +61,8 @@
 
 // any database comment associated with this column.  May be null
 protected String remarks;
+
+protected String defaultValue;
 
 /**
  * Constructs a Column definition.  This object holds all the 
@@ -278,4 +280,12 @@
 public void setRemarks(String remarks) {
 this.remarks = remarks;
 }
+
+public String getDefaultValue() {
+return defaultValue;
+}
+
+public void setDefaultValue(String defaultValue) {
+this.defaultValue = defaultValue;
+}
 }

Modified: 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java?rev=836404r1=836403r2=836404view=diff
==
--- 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
 (original)
+++ 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
 Sun Nov 15 20:20:21 2009
@@ -444,6 +444,7 @@
 introspectedColumn.setNullable(rs.getInt(NULLABLE) == 
DatabaseMetaData.columnNullable); //$NON-NLS-1$
 introspectedColumn.setScale(rs.getInt(DECIMAL_DIGITS)); 
//$NON-NLS-1$
 introspectedColumn.setRemarks(rs.getString(REMARKS)); 
//$NON-NLS-1$
+introspectedColumn.setDefaultValue(rs.getString(COLUMN_DEF)); 
//$NON-NLS-1$
 
 ActualTableName atn = new 
ActualTableName(rs.getString(TABLE_CAT), //$NON-NLS-1$
 rs.getString(TABLE_SCHEM), //$NON-NLS-1$

svn commit: r836419 - /ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/AbstractXmlElementGenerator.java

[jgbutler]

Author: jgbutler
Date: Sun Nov 15 20:50:38 2009
New Revision: 836419

URL: http://svn.apache.org/viewvc?rev=836419view=rev
Log:
[ibator] fix selectkey for ibatis3

Modified:

ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/AbstractXmlElementGenerator.java

Modified: 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/AbstractXmlElementGenerator.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/AbstractXmlElementGenerator.java?rev=836419r1=836418r2=836419view=diff
==
--- 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/AbstractXmlElementGenerator.java
 (original)
+++ 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/AbstractXmlElementGenerator.java
 Sun Nov 15 20:50:38 2009
@@ -54,7 +54,13 @@
 answer.addAttribute(new Attribute(
 keyProperty, introspectedColumn.getJavaProperty())); 
//$NON-NLS-1$
 if(StringUtility.stringHasValue(generatedKey.getType())) {
-  answer.addAttribute(new Attribute(type, generatedKey.getType())); 
//$NON-NLS-1$  
+if (pre.equalsIgnoreCase(generatedKey.getType())) { //$NON-NLS-1$
+answer.addAttribute(new Attribute(order, BEFORE)); 
//$NON-NLS-1$ //$NON-NLS-2$  
+} else if (post.equalsIgnoreCase(generatedKey.getType())) { 
//$NON-NLS-1$
+answer.addAttribute(new Attribute(order, AFTER)); 
//$NON-NLS-1$ //$NON-NLS-2$  
+} else {
+answer.addAttribute(new Attribute(order, 
generatedKey.getType())); //$NON-NLS-1$  
+}
 }
 answer.addElement(new 
TextElement(generatedKey.getRuntimeSqlStatement()));