Author: oltka
Date: Tue Mar 13 15:46:44 2012
New Revision: 1300201
URL: http://svn.apache.org/viewvc?rev=1300201&view=rev
Log:
CAY-1685 revert r1300187
Modified:
cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjAttribute.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/QuotedIdentifiersTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quoted-identifiers.map.xml
Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1300201&r1=1300200&r2=1300201&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Tue Mar 13
15:46:44 2012
@@ -49,7 +49,6 @@ CAY-1675 [PATCH] add .first(List<T>) met
CAY-1679 A notion of default node
CAY-1680 Get rid of shared locks in DataDomain metadata lookups
CAY-1684 Upgrade commons-collections dependency to 3.2.1
-CAY-1685 Working with a database that has dots "." in column names- "Quote SQL
identifiers" does not seem to help.
Bug Fixes Since 3.1M3:
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjAttribute.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjAttribute.java?rev=1300201&r1=1300200&r2=1300201&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjAttribute.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjAttribute.java
Tue Mar 13 15:46:44 2012
@@ -241,9 +241,8 @@ public class ObjAttribute extends Attrib
}
int lastPartStart = dbAttributePath.lastIndexOf('.');
- DbAttribute attribute = (DbAttribute)
dbEnt.getAttribute(dbAttributePath);
-
- if (lastPartStart < 0 || (attribute != null &&
dbEnt.getDataMap().isQuotingSQLIdentifiers())) {
+ if (lastPartStart < 0) {
+ DbAttribute attribute = (DbAttribute)
dbEnt.getAttribute(dbAttributePath);
if (attribute == null) {
return IteratorUtils.EMPTY_ITERATOR;
}
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/QuotedIdentifiersTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/QuotedIdentifiersTest.java?rev=1300201&r1=1300200&r2=1300201&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/QuotedIdentifiersTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/QuotedIdentifiersTest.java
Tue Mar 13 15:46:44 2012
@@ -27,8 +27,6 @@ import org.apache.cayenne.ObjectId;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.ObjAttribute;
-import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.query.ObjectIdQuery;
import org.apache.cayenne.query.RelationshipQuery;
import org.apache.cayenne.query.SelectQuery;
@@ -59,7 +57,6 @@ public class QuotedIdentifiersTest exten
QuoteAdress quoteAdress = context.newObject(QuoteAdress.class);
quoteAdress.setCity("city");
quoteAdress.setGroup("324");
- quoteAdress.setWith_point("string");
Quote_Person quote_Person = context.newObject(Quote_Person.class);
quote_Person.setSalary(10000);
@@ -79,7 +76,7 @@ public class QuotedIdentifiersTest exten
QuoteAdress quoteAdress2 = context.newObject(QuoteAdress.class);
quoteAdress2.setCity("city2");
-
+
Quote_Person quote_Person2 = context.newObject(Quote_Person.class);
quote_Person2.setSalary(100);
quote_Person2.setName("Name");
@@ -89,14 +86,10 @@ public class QuotedIdentifiersTest exten
context.commitChanges();
- ObjEntity objEntity = context
- .getEntityResolver()
- .lookupObjEntity(QuoteAdress.class);
-
- assertEquals("with.point",
((ObjAttribute)objEntity.getAttribute("with_point")).getDbAttribute().getName());
-
- DbEntity entity = objEntity.getDbEntity();
-
+ DbEntity entity = context
+ .getEntityResolver()
+ .lookupObjEntity(QuoteAdress.class)
+ .getDbEntity();
List idAttributes =
Collections.singletonList(entity.getAttribute("City"));
List updatedAttributes =
Collections.singletonList(entity.getAttribute("City"));
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java?rev=1300201&r1=1300200&r2=1300201&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java
Tue Mar 13 15:46:44 2012
@@ -13,38 +13,30 @@ public abstract class _QuoteAdress exten
public static final String CITY_PROPERTY = "city";
public static final String GROUP_PROPERTY = "group";
- public static final String WITH_POINT_PROPERTY = "with_point";
public static final String PERSON_REL_PROPERTY = "person_Rel";
public static final String ADDRESS_ID_PK_COLUMN = "ADDRESS ID";
public void setCity(String city) {
- writeProperty(CITY_PROPERTY, city);
+ writeProperty("city", city);
}
public String getCity() {
- return (String)readProperty(CITY_PROPERTY);
+ return (String)readProperty("city");
}
public void setGroup(String group) {
- writeProperty(GROUP_PROPERTY, group);
+ writeProperty("group", group);
}
public String getGroup() {
- return (String)readProperty(GROUP_PROPERTY);
- }
-
- public void setWith_point(String with_point) {
- writeProperty(WITH_POINT_PROPERTY, with_point);
- }
- public String getWith_point() {
- return (String)readProperty(WITH_POINT_PROPERTY);
+ return (String)readProperty("group");
}
public void setPerson_Rel(Quote_Person person_Rel) {
- setToOneTarget(PERSON_REL_PROPERTY, person_Rel, true);
+ setToOneTarget("person_Rel", person_Rel, true);
}
public Quote_Person getPerson_Rel() {
- return (Quote_Person)readProperty(PERSON_REL_PROPERTY);
+ return (Quote_Person)readProperty("person_Rel");
}
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java?rev=1300201&r1=1300200&r2=1300201&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java
Tue Mar 13 15:46:44 2012
@@ -23,46 +23,46 @@ public abstract class _Quote_Person exte
public static final String ID_PK_COLUMN = "id";
public void setDAte(Date dAte) {
- writeProperty(D_ATE_PROPERTY, dAte);
+ writeProperty("dAte", dAte);
}
public Date getDAte() {
- return (Date)readProperty(D_ATE_PROPERTY);
+ return (Date)readProperty("dAte");
}
public void setFULL_name(String fULL_name) {
- writeProperty(F_ULL_NAME_PROPERTY, fULL_name);
+ writeProperty("fULL_name", fULL_name);
}
public String getFULL_name() {
- return (String)readProperty(F_ULL_NAME_PROPERTY);
+ return (String)readProperty("fULL_name");
}
public void setGroup(String group) {
- writeProperty(GROUP_PROPERTY, group);
+ writeProperty("group", group);
}
public String getGroup() {
- return (String)readProperty(GROUP_PROPERTY);
+ return (String)readProperty("group");
}
public void setName(String name) {
- writeProperty(NAME_PROPERTY, name);
+ writeProperty("name", name);
}
public String getName() {
- return (String)readProperty(NAME_PROPERTY);
+ return (String)readProperty("name");
}
public void setSalary(Integer salary) {
- writeProperty(SALARY_PROPERTY, salary);
+ writeProperty("salary", salary);
}
public Integer getSalary() {
- return (Integer)readProperty(SALARY_PROPERTY);
+ return (Integer)readProperty("salary");
}
public void setAddress_Rel(QuoteAdress address_Rel) {
- setToOneTarget(ADDRESS_REL_PROPERTY, address_Rel, true);
+ setToOneTarget("address_Rel", address_Rel, true);
}
public QuoteAdress getAddress_Rel() {
- return (QuoteAdress)readProperty(ADDRESS_REL_PROPERTY);
+ return (QuoteAdress)readProperty("address_Rel");
}
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quoted-identifiers.map.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quoted-identifiers.map.xml?rev=1300201&r1=1300200&r2=1300201&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quoted-identifiers.map.xml
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quoted-identifiers.map.xml
Tue Mar 13 15:46:44 2012
@@ -9,7 +9,6 @@
<db-attribute name="ADDRESS ID" type="INTEGER"
isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="City" type="VARCHAR" length="200"/>
<db-attribute name="group" type="VARCHAR" length="100"/>
- <db-attribute name="with.point" type="VARCHAR" length="100"/>
</db-entity>
<db-entity name="quote Person">
<db-attribute name="DAte" type="DATE"/>
@@ -23,7 +22,6 @@
<obj-entity name="QuoteAdress"
className="org.apache.cayenne.testdo.quotemap.QuoteAdress"
dbEntityName="QUOTED_ADDRESS">
<obj-attribute name="city" type="java.lang.String"
db-attribute-path="City"/>
<obj-attribute name="group" type="java.lang.String"
db-attribute-path="group"/>
- <obj-attribute name="with_point" type="java.lang.String"
db-attribute-path="with.point"/>
</obj-entity>
<obj-entity name="Quote_Person"
className="org.apache.cayenne.testdo.quotemap.Quote_Person" dbEntityName="quote
Person">
<obj-attribute name="dAte" type="java.util.Date"
db-attribute-path="DAte"/>
