svn commit: r911119 - in /ibatis/java/ibator/trunk/core/ibator-core: doc/ src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/

[jgbutler]

Author: jgbutler
Date: Wed Feb 17 17:55:37 2010
New Revision: 99

URL: http://svn.apache.org/viewvc?rev=99view=rev
Log:
[Ibator] Fix for IBATIS-731 - rename key field to avoid name collisions

Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt

ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java

ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java

Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt?rev=99r1=98r2=99view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Wed Feb 17 
17:55:37 2010
@@ -15,6 +15,7 @@
 4. Fixed IBATIS-601 - improper validation of generatedKey
 5. Fixed IBATIS-609 - incorrect parsing of Java generic types
 6. Fixed spelling error LONCVARCHAR-LONGVARCHAR (thanks Allard)
+7. Fixed IBATIS-731 - change name of primary key variable to avoid conflicts
 
 Enhancements:
 1. IBATIS-569 - Make it easier to override IbatorRules in plugins
@@ -42,6 +43,7 @@
 19. Added new or method to example classes
 20. Added new useCompoundColumnNames property on table
 
+
 ---
 Version 1.2.1:
 

Modified: 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java?rev=99r1=98r2=99view=diff
==
--- 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java
 (original)
+++ 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java
 Wed Feb 17 17:55:37 2010
@@ -54,14 +54,14 @@
 
 sb.setLength(0);
 sb.append(keyType.getShortName());
-sb.append( key = new ); //$NON-NLS-1$
+sb.append( _key = new ); //$NON-NLS-1$
 sb.append(keyType.getShortName());
 sb.append(();); //$NON-NLS-1$
 method.addBodyLine(sb.toString());
 
 for (IntrospectedColumn introspectedColumn : 
introspectedTable.getPrimaryKeyColumns()) {
 sb.setLength(0);
-sb.append(key.); //$NON-NLS-1$
+sb.append(_key.); //$NON-NLS-1$
 sb.append(JavaBeansUtil.getSetterMethodName(introspectedColumn
 .getJavaProperty()));
 sb.append('(');
@@ -74,7 +74,7 @@
 sb.setLength(0);
 sb.append(int rows = ); //$NON-NLS-1$
 
sb.append(daoTemplate.getDeleteMethod(introspectedTable.getIbatis2SqlMapNamespace(),
-introspectedTable.getDeleteByPrimaryKeyStatementId(), key)); 
//$NON-NLS-1$
+introspectedTable.getDeleteByPrimaryKeyStatementId(), 
_key)); //$NON-NLS-1$
 method.addBodyLine(sb.toString());
 method.addBodyLine(return rows;); //$NON-NLS-1$
 
@@ -105,7 +105,7 @@
 if (introspectedTable.getRules().generatePrimaryKeyClass()) {
 FullyQualifiedJavaType type = new 
FullyQualifiedJavaType(introspectedTable.getPrimaryKeyType());
 importedTypes.add(type);
-method.addParameter(new Parameter(type, key)); //$NON-NLS-1$
+method.addParameter(new Parameter(type, _key)); //$NON-NLS-1$
 } else {
 for (IntrospectedColumn introspectedColumn : 
introspectedTable.getPrimaryKeyColumns()) {
 FullyQualifiedJavaType type = introspectedColumn

Modified: 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java?rev=99r1=98r2=99view=diff
==
--- 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java
 (original)
+++ 

svn commit: r911126 - in /ibatis/java/ibator/trunk/core/ibator-core: doc/ReleaseNotes.txt src/main/java/org/apache/ibatis/ibator/api/Ibator.java

[jgbutler]

Author: jgbutler
Date: Wed Feb 17 18:04:03 2010
New Revision: 911126

URL: http://svn.apache.org/viewvc?rev=911126view=rev
Log:
[Ibator] Fixes for IBATIS-699 - Overwrite unmergeable XML files if enabled

Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt

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

Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt?rev=911126r1=911125r2=911126view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Wed Feb 17 
18:04:03 2010
@@ -16,6 +16,7 @@
 5. Fixed IBATIS-609 - incorrect parsing of Java generic types
 6. Fixed spelling error LONCVARCHAR-LONGVARCHAR (thanks Allard)
 7. Fixed IBATIS-731 - change name of primary key variable to avoid conflicts
+8. Fixed IBATIS-699 - Overwrite unmergeable XML files if enabled
 
 Enhancements:
 1. IBATIS-569 - Make it easier to override IbatorRules in plugins

Modified: 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/Ibator.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/Ibator.java?rev=911126r1=911125r2=911126view=diff
==
--- 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/Ibator.java
 (original)
+++ 
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/Ibator.java
 Wed Feb 17 18:04:03 2010
@@ -234,6 +234,10 @@
 if (targetFile.exists()) {
 if (gxf.isMergeable()) {
 source = XmlFileMergerJaxp.getMergedSource(gxf, 
targetFile);
+} else if (shellCallback.isOverwriteEnabled()) {
+   source = gxf.getFormattedContent();
+warnings.add(Messages.getString(Warning.11, 
//$NON-NLS-1$
+targetFile.getAbsolutePath()));
 } else {
 source = gxf.getFormattedContent();
 targetFile = getUniqueFileName(directory, 
gxf.getFileName());