Permalink
Browse files

OPENJPA-2207 Fix single numeric db identifier problem

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1348076 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent d130646 commit 4659638a1d741e95a95d591df1ee7c3209f88ee5 Dianne E. Richards committed Jun 8, 2012
@@ -323,7 +323,7 @@ public boolean isDelimited(IdentifierRule rule, String name) {
}
public boolean isDelimited(IdentifierConfiguration config, IdentifierRule rule, String name) {
- if (name == null || name.length() <= 3) {
+ if (name == null || name.length() < 3) {
return false;
}
return name.startsWith(config.getLeadingDelimiter()) &&
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.results.cls;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityResult;
+import javax.persistence.FieldResult;
+import javax.persistence.Id;
+import javax.persistence.NamedNativeQueries;
+import javax.persistence.NamedNativeQuery;
+import javax.persistence.SqlResultSetMapping;
+
+@NamedNativeQueries({
+@NamedNativeQuery(name = "ResultClsQueryDoubleQuotes",
+ query = "select \"1\",\"2\" FROM ResultClsAnnoEntity",
+ resultSetMapping = "ResultClsRSMapping",
+ resultClass = ResultClsAnnotation.class),
+@NamedNativeQuery(name = "ResultClsQueryBackTicks",
+ query = "select `1`,`2` FROM ResultClsAnnoEntity",
+ resultSetMapping = "ResultClsRSMapping",
+ resultClass = ResultClsAnnotation.class),
+@NamedNativeQuery(name = "ResultClsQueryBrackets",
+ query = "select [1],[2] FROM ResultClsAnnoEntity",
+ resultSetMapping = "ResultClsRSMapping",
+ resultClass = ResultClsAnnotation.class),
+@NamedNativeQuery(name = "ResultClsQueryDefault",
+ query = "select * FROM ResultClsAnnoEntity",
+ resultSetMapping = "ResultClsRSMapping",
+ resultClass = ResultClsAnnotation.class)
+})
+
+@SqlResultSetMapping(name = "ResultClsRSMapping",
+ entities = @EntityResult(entityClass = ResultClsAnnotation.class, fields = {
+ @FieldResult(name = "id", column = "1"),
+ @FieldResult(name = "description", column = "2") }))
+@Entity(name = "ResultClsAnnoEntity")
+public class ResultClsAnnotation {
+ public ResultClsAnnotation() {
+ }
+
+ @Id
+ @Column(name = "1")
+ public String id;
+ @Basic
+ @Column(name = "2")
+ public String description;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+}
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.results.cls;
+
+public class ResultClsXml {
+ public ResultClsXml() {
+ }
+
+ public String id;
+ public String description;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+}
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.results.cls;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+
+public class TestResultClsAnnotation extends SQLListenerTestCase {
+ public void setUp() {
+ setUp(ResultClsAnnotation.class, DROP_TABLES);
+ assertNotNull(emf);
+
+ populate();
+ }
+
+ public void testIt() {
+ EntityManager em = emf.createEntityManager();
+
+ try {
+ Query q = getQuery(em);
+ List<ResultClsAnnotation> result = q.getResultList();
+ assertEquals(1, result.size());
+
+ for (Iterator it = result.iterator(); it.hasNext();) {
+ Object obj = (Object) it.next();
+ ResultClsAnnotation ct = (ResultClsAnnotation) obj;
+ assertEquals("id1", ct.getId());
+ assertEquals("description1", ct.getDescription());
+ }
+ } catch (Exception ex) {
+ fail("unexpected exception: " + ex.getMessage());
+ ex.printStackTrace();
+ } finally {
+ em.close();
+ }
+ }
+
+ private void populate() {
+ EntityManager em = emf.createEntityManager();
+ em.getTransaction().begin();
+
+ ResultClsAnnotation ct = new ResultClsAnnotation();
+ ct.setId("id1");
+ ct.setDescription("description1");
+ em.persist(ct);
+
+ em.getTransaction().commit();
+ em.close();
+ }
+
+ private Query getQuery(EntityManager em) {
+ DBDictionary dict = getDBDictionary();
+ Query query = null;
+ if (dict.getLeadingDelimiter().equals("\"") && dict.getTrailingDelimiter().equals("\"")) {
+ query = em.createNamedQuery("ResultClsQueryDoubleQuotes");
+ } else if (dict.getLeadingDelimiter().equals("`") && dict.getTrailingDelimiter().equals("`")) {
+ query = em.createNamedQuery("ResultClsQueryBackTicks");
+ } else if (dict.getLeadingDelimiter().equals("[") && dict.getTrailingDelimiter().equals("]")) {
+ query = em.createNamedQuery("ResultClsQueryBrackets");
+ } else {
+ query = em.createNamedQuery("ResultClsQueryDefault");
+ }
+ return query;
+ }
+}
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.results.cls;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+
+public class TestResultClsXml extends SQLListenerTestCase {
+ public void setUp() {
+ setUp(ResultClsXml.class, DROP_TABLES);
+ assertNotNull(emf);
+
+ populate();
+ }
+
+ public void testIt() {
+ EntityManager em = emf.createEntityManager();
+
+ try {
+ Query q = getQuery(em);
+
+ List<ResultClsXml> result = q.getResultList();
+ assertEquals(1, result.size());
+
+ for (Iterator it = result.iterator(); it.hasNext();) {
+ Object obj = (Object) it.next();
+ ResultClsXml ct = (ResultClsXml) obj;
+ assertEquals("id1", ct.getId());
+ assertEquals("description1", ct.getDescription());
+ }
+
+ } catch (Exception ex) {
+ fail("unexpected exception: " + ex.getMessage());
+ ex.printStackTrace();
+
+ } finally {
+ em.close();
+ }
+ }
+
+ protected String getPersistenceUnitName() {
+ return "query-result";
+ }
+
+ private void populate() {
+ EntityManager em = emf.createEntityManager();
+ em.getTransaction().begin();
+
+ ResultClsXml ct = new ResultClsXml();
+ ct.setId("id1");
+ ct.setDescription("description1");
+ em.persist(ct);
+
+ em.getTransaction().commit();
+ em.close();
+ }
+
+ private Query getQuery(EntityManager em) {
+ DBDictionary dict = getDBDictionary();
+ Query query = null;
+ if (dict.getLeadingDelimiter().equals("\"") && dict.getTrailingDelimiter().equals("\"")) {
+ query = em.createNamedQuery("ResultClsQueryDoubleQuotes");
+ } else if (dict.getLeadingDelimiter().equals("`") && dict.getTrailingDelimiter().equals("`")) {
+ query = em.createNamedQuery("ResultClsQueryBackTicks");
+ } else if (dict.getLeadingDelimiter().equals("[") && dict.getTrailingDelimiter().equals("]")) {
+ query = em.createNamedQuery("ResultClsQueryBrackets");
+ } else {
+ query = em.createNamedQuery("ResultClsQueryDefault");
+ }
+ return query;
+ }
+}
@@ -55,6 +55,7 @@
<mapping-file>org/apache/openjpa/persistence/enhance/identity/mapsId-orm.xml</mapping-file>
<mapping-file>org/apache/openjpa/persistence/entity/orm.xml</mapping-file>
<mapping-file>META-INF/arrays-orm.xml</mapping-file>
+ <mapping-file>META-INF/query-result-orm.xml</mapping-file>
<properties>
<property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema(ForeignKeys=true)"/>
@@ -430,5 +431,15 @@
value="buildSchema(ForeignKeys=true)"/>
</properties>
</persistence-unit>
+
+ <persistence-unit name="query-result">
+ <mapping-file>META-INF/query-result-orm.xml</mapping-file>
+ <class>org.apache.openjpa.persistence.results.cls.ResultClsXml</class>
+ <properties>
+ <property name="openjpa.jdbc.SynchronizeMappings"
+ value="buildSchema(ForeignKeys=true)"/>
+ </properties>
+ </persistence-unit>
+
</persistence>
Oops, something went wrong.

0 comments on commit 4659638

Please sign in to comment.