Author: jgbutler
Date: Tue Nov 7 19:45:27 2006
New Revision: 472376
URL: http://svn.apache.org/viewvc?view=rev&rev=472376
Log:
Abator: Changes for IBATIS-364 - database dialect for SYBASE, also other minor
changes
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/generatedKey.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/AbatorContext.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/AbatorConfigurationParser.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseDialects.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/JavaBeansUtil.java
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt?view=diff&rev=472376&r1=472375&r2=472376
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt Tue
Nov 7 19:45:27 2006
@@ -17,6 +17,7 @@
5. Add afterXXXGenerationHook() methods in all generators to enable adding
extra Java code or XML elements to any generated object. Will make it
easier to create customized generators
+6. Added SYBASE database dialect for generated keys
-------------------------------------------------------------------------------
Version 1.0.0:
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/generatedKey.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/generatedKey.html?view=diff&rev=472376&r1=472375&r2=472376
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/generatedKey.html
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/generatedKey.html
Tue Nov 7 19:45:27 2006
@@ -56,6 +56,10 @@
<th>SqlServer</th>
<td>This will translate to <code>SELECT
SCOPE_IDENTITY()</code></td>
</tr>
+ <tr>
+ <th>SYBASE</th>
+ <td>This will translate to <code>SELECT @@IDENTITY</code></td>
+ </tr>
</table>
</td>
</tr>
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/AbatorContext.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/AbatorContext.java?view=diff&rev=472376&r1=472375&r2=472376
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/AbatorContext.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/AbatorContext.java
Tue Nov 7 19:45:27 2006
@@ -361,7 +361,10 @@
*/
public XmlElement toXmlElement() {
XmlElement xmlElement = new XmlElement("abatorContext"); //$NON-NLS-1$
- xmlElement.addAttribute(new Attribute("defaultModelType",
defaultModelType.getModelType())); //$NON-NLS-1$
+
+ if (defaultModelType != ModelType.CONDITIONAL) {
+ xmlElement.addAttribute(new Attribute("defaultModelType",
defaultModelType.getModelType())); //$NON-NLS-1$
+ }
if (StringUtility.stringHasValue(configuredGeneratorSet)) {
xmlElement.addAttribute(new Attribute("generatorSet",
configuredGeneratorSet)); //$NON-NLS-1$
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java?view=diff&rev=472376&r1=472375&r2=472376
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java
Tue Nov 7 19:45:27 2006
@@ -61,6 +61,7 @@
private String alias;
private ModelType modelType;
private boolean wildcardEscapingEnabled;
+ private String configuredModelType;
public TableConfiguration(AbatorContext abatorContext) {
super();
@@ -291,8 +292,9 @@
return modelType;
}
- public void setModelType(ModelType modelType) {
- this.modelType = modelType;
+ public void setConfiguredModelType(String configuredModelType) {
+ this.configuredModelType = configuredModelType;
+ this.modelType = ModelType.getModelType(configuredModelType);
}
public boolean isWildcardEscapingEnabled() {
@@ -355,8 +357,8 @@
xmlElement.addAttribute(new Attribute("selectByExampleQueryId",
selectByExampleQueryId)); //$NON-NLS-1$
}
- if (modelType != null) {
- xmlElement.addAttribute(new Attribute("modelType",
modelType.getModelType())); //$NON-NLS-1$
+ if (configuredModelType != null) {
+ xmlElement.addAttribute(new Attribute("modelType",
configuredModelType)); //$NON-NLS-1$
}
if (wildcardEscapingEnabled) {
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/AbatorConfigurationParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/AbatorConfigurationParser.java?view=diff&rev=472376&r1=472375&r2=472376
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/AbatorConfigurationParser.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/AbatorConfigurationParser.java
Tue Nov 7 19:45:27 2006
@@ -390,7 +390,7 @@
}
if (StringUtility.stringHasValue(modelType)) {
- tc.setModelType(ModelType.getModelType(modelType));
+ tc.setConfiguredModelType(modelType);
}
if (StringUtility.stringHasValue(escapeWildcards)) {
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseDialects.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseDialects.java?view=diff&rev=472376&r1=472375&r2=472376
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseDialects.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseDialects.java
Tue Nov 7 19:45:27 2006
@@ -34,6 +34,8 @@
public static final DatabaseDialects HSQLDB = new DatabaseDialects("CALL
IDENTITY()"); //$NON-NLS-1$
+ public static final DatabaseDialects SYBASE = new DatabaseDialects("SELECT
@@IDENTITY"); //$NON-NLS-1$
+
private String identityRetrievalStatement;
/**
@@ -69,6 +71,8 @@
returnValue = DERBY;
} else if ("HSQLDB".equalsIgnoreCase(database)) { //$NON-NLS-1$
returnValue = HSQLDB;
+ } else if ("SYBASE".equalsIgnoreCase(database)) { //$NON-NLS-1$
+ returnValue = SYBASE;
}
return returnValue;
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/JavaBeansUtil.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/JavaBeansUtil.java?view=diff&rev=472376&r1=472375&r2=472376
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/JavaBeansUtil.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/JavaBeansUtil.java
Tue Nov 7 19:45:27 2006
@@ -67,6 +67,7 @@
case '@':
case '$':
case '#':
+ case ' ':
if (sb.length() > 0) {
nextUpperCase = true;
}
