You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2008/01/06 17:49:55 UTC
svn commit: r609343 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser:
ASTList.java ASTScalar.java SimpleNode.java
Author: aadamchik
Date: Sun Jan 6 08:49:51 2008
New Revision: 609343
URL: http://svn.apache.org/viewvc?rev=609343&view=rev
Log:
CAY-956 Converter between Expression and EJBQL Expression
(fixing quote char)
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTList.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTScalar.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTList.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTList.java?rev=609343&r1=609342&r2=609343&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTList.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTList.java Sun Jan 6 08:49:51 2008
@@ -101,7 +101,7 @@
((Expression) values[i]).encodeAsString(pw);
}
else {
- encodeScalarAsString(pw, values[i]);
+ encodeScalarAsString(pw, values[i], '\"');
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTScalar.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTScalar.java?rev=609343&r1=609342&r2=609343&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTScalar.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/ASTScalar.java Sun Jan 6 08:49:51 2008
@@ -62,7 +62,7 @@
}
public void encodeAsString(PrintWriter pw) {
- SimpleNode.encodeScalarAsString(pw, value);
+ SimpleNode.encodeScalarAsString(pw, value, '\"');
}
/**
@@ -70,7 +70,7 @@
*/
@Override
public void encodeAsEJBQL(PrintWriter pw, String rootId) {
- SimpleNode.encodeScalarAsString(pw, value);
+ SimpleNode.encodeScalarAsString(pw, value, '\'');
}
public void setValue(Object value) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java?rev=609343&r1=609342&r2=609343&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java Sun Jan 6 08:49:51 2008
@@ -48,11 +48,11 @@
/**
* Utility method that encodes an object that is not an expression Node to String.
*/
- protected static void encodeScalarAsString(PrintWriter pw, Object scalar) {
+ protected static void encodeScalarAsString(PrintWriter pw, Object scalar, char quoteChar) {
boolean quote = scalar instanceof String;
if (quote) {
- pw.print('\"');
+ pw.print(quoteChar);
}
// encode only ObjectId for Persistent, ensure that the order of keys is
@@ -66,7 +66,7 @@
encodeAsEscapedString(pw, String.valueOf(scalar));
if (quote) {
- pw.print('\"');
+ pw.print(quoteChar);
}
}