You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2010/04/21 21:11:45 UTC
svn commit: r936449 -
/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
Author: faywang
Date: Wed Apr 21 19:11:45 2010
New Revision: 936449
URL: http://svn.apache.org/viewvc?rev=936449&view=rev
Log:
OPENJPA-1596: fix index name for DB2 zOS when schema is present.
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=936449&r1=936448&r2=936449&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Wed Apr 21 19:11:45 2010
@@ -33,6 +33,7 @@ import java.util.Set;
import java.util.StringTokenizer;
import org.apache.openjpa.jdbc.identifier.DBIdentifier;
+import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
import org.apache.openjpa.jdbc.kernel.exps.Lit;
@@ -912,8 +913,10 @@ public class DB2Dictionary
// build the index for the sequence tables
// the index name will be the fully qualified table name + _IDX
Table tab = schema.getTable(table);
- DBIdentifier idxName = DBIdentifier.append(tab.getFullIdentifier(), "IDX");
- Index idx = tab.addIndex(getValidIndexName(idxName, tab));
+ DBIdentifier fullIdxId = tab.getFullIdentifier().clone();
+ DBIdentifier unQualifiedName = DBIdentifier.append(fullIdxId.getUnqualifiedName(), "IDX");
+ fullIdxId.setName(getValidIndexName(unQualifiedName, tab));
+ Index idx = tab.addIndex(fullIdxId);
idx.setUnique(true);
idx.addColumn(pkColumn);
}
Re: svn commit: r936449 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
Posted by Michael Dick <mi...@gmail.com>.
I agree, once a fix an issue is resolved in a particular release stream we
can't use the same JIRA number.
Porting a fix to an earlier or later minor / major release doesn't seem to
be a problem though. For example if I brought this back to 1.2.3 I'd want to
use the same JIRA number. It wasn't marked as fixed in 1.2.2,1.2.1,or 1.2.0
- so there's no duplication in the same stream.
FWIW the commit message can be updated when we have the new JIRA number.
That will help with svn log output, but it won't re-link with the JIRA
issue. I think the linking is a post commit hook - updating the commit
message wouldn't trigger it.
-mike
On Wed, Apr 21, 2010 at 3:36 PM, Donald Woods <dw...@apache.org> wrote:
> Fay, please open a new JIRA for this, as 1596 has already been marked as
> resolved and included in the 2.0.0 release notes.
>
>
> -Donald
>
>
> On 4/21/10 3:11 PM, faywang@apache.org wrote:
> > Author: faywang
> > Date: Wed Apr 21 19:11:45 2010
> > New Revision: 936449
> >
> > URL: http://svn.apache.org/viewvc?rev=936449&view=rev
> > Log:
> > OPENJPA-1596: fix index name for DB2 zOS when schema is present.
> >
> > Modified:
> >
> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
> >
> > Modified:
> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
> > URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=936449&r1=936448&r2=936449&view=diff
> >
> ==============================================================================
> > ---
> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
> (original)
> > +++
> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
> Wed Apr 21 19:11:45 2010
> > @@ -33,6 +33,7 @@ import java.util.Set;
> > import java.util.StringTokenizer;
> >
> > import org.apache.openjpa.jdbc.identifier.DBIdentifier;
> > +import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
> > import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
> > import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
> > import org.apache.openjpa.jdbc.kernel.exps.Lit;
> > @@ -912,8 +913,10 @@ public class DB2Dictionary
> > // build the index for the sequence tables
> > // the index name will be the fully qualified table name +
> _IDX
> > Table tab = schema.getTable(table);
> > - DBIdentifier idxName =
> DBIdentifier.append(tab.getFullIdentifier(), "IDX");
> > - Index idx = tab.addIndex(getValidIndexName(idxName, tab));
> > + DBIdentifier fullIdxId = tab.getFullIdentifier().clone();
> > + DBIdentifier unQualifiedName =
> DBIdentifier.append(fullIdxId.getUnqualifiedName(), "IDX");
> > + fullIdxId.setName(getValidIndexName(unQualifiedName, tab));
> > + Index idx = tab.addIndex(fullIdxId);
> > idx.setUnique(true);
> > idx.addColumn(pkColumn);
> > }
> >
> >
> >
>
Re: svn commit: r936449 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
Posted by Donald Woods <dw...@apache.org>.
Fay, please open a new JIRA for this, as 1596 has already been marked as
resolved and included in the 2.0.0 release notes.
-Donald
On 4/21/10 3:11 PM, faywang@apache.org wrote:
> Author: faywang
> Date: Wed Apr 21 19:11:45 2010
> New Revision: 936449
>
> URL: http://svn.apache.org/viewvc?rev=936449&view=rev
> Log:
> OPENJPA-1596: fix index name for DB2 zOS when schema is present.
>
> Modified:
> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
>
> Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
> URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=936449&r1=936448&r2=936449&view=diff
> ==============================================================================
> --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original)
> +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Wed Apr 21 19:11:45 2010
> @@ -33,6 +33,7 @@ import java.util.Set;
> import java.util.StringTokenizer;
>
> import org.apache.openjpa.jdbc.identifier.DBIdentifier;
> +import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
> import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
> import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
> import org.apache.openjpa.jdbc.kernel.exps.Lit;
> @@ -912,8 +913,10 @@ public class DB2Dictionary
> // build the index for the sequence tables
> // the index name will be the fully qualified table name + _IDX
> Table tab = schema.getTable(table);
> - DBIdentifier idxName = DBIdentifier.append(tab.getFullIdentifier(), "IDX");
> - Index idx = tab.addIndex(getValidIndexName(idxName, tab));
> + DBIdentifier fullIdxId = tab.getFullIdentifier().clone();
> + DBIdentifier unQualifiedName = DBIdentifier.append(fullIdxId.getUnqualifiedName(), "IDX");
> + fullIdxId.setName(getValidIndexName(unQualifiedName, tab));
> + Index idx = tab.addIndex(fullIdxId);
> idx.setUnique(true);
> idx.addColumn(pkColumn);
> }
>
>
>