You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by sv...@apache.org on 2004/05/01 02:55:12 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/datastore/jdbc FindTModelByCategoryQuery.java FindServiceByNameQuery.java FindTModelByIdentifierQuery.java FindBusinessByDiscoveryURLQuery.java FindBusinessByCategoryQuery.java FindBusinessByNameQuery.java FindBindingByCategoryQuery.java FindServiceByTModelKeyQuery.java FindBusinessByIdentifierQuery.java FindServiceByCategoryQuery.java FindBindingByTModelKeyQuery.java FindTModelByNameQuery.java FindPublisherByNameQuery.java FindBusinessByTModelKeyQuery.java
sviens 2004/04/30 17:55:12
Modified: src/java/org/apache/juddi/datastore/jdbc
FindTModelByCategoryQuery.java
FindServiceByNameQuery.java
FindTModelByIdentifierQuery.java
FindBusinessByDiscoveryURLQuery.java
FindBusinessByCategoryQuery.java
FindBusinessByNameQuery.java
FindBindingByCategoryQuery.java
FindServiceByTModelKeyQuery.java
FindBusinessByIdentifierQuery.java
FindServiceByCategoryQuery.java
FindBindingByTModelKeyQuery.java
FindTModelByNameQuery.java
FindPublisherByNameQuery.java
FindBusinessByTModelKeyQuery.java
Log:
Corrected SQL wild card bug introduced with intro of the DynamicQuery class.
Revision Changes Path
1.6 +1 -1 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindTModelByCategoryQuery.java
Index: FindTModelByCategoryQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindTModelByCategoryQuery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FindTModelByCategoryQuery.java 30 Apr 2004 03:49:26 -0000 1.5
+++ FindTModelByCategoryQuery.java 1 May 2004 00:55:12 -0000 1.6
@@ -76,7 +76,7 @@
try
{
- log.debug("select from TMODEL & TMODEL_CATEGORY tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
1.4 +2 -2 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindServiceByNameQuery.java
Index: FindServiceByNameQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindServiceByNameQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindServiceByNameQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindServiceByNameQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -78,7 +78,7 @@
try
{
- log.debug("select from BUSINESS_SERVICE & SERVICE_NAME tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
@@ -146,7 +146,7 @@
else
{
sql.append("(NAME LIKE ?");
- sql.addValue(text+"%");
+ sql.addValue(text.endsWith("%") ? text : text+"%");
}
if ((lang != null) && (lang.length() > 0))
1.4 +1 -1 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindTModelByIdentifierQuery.java
Index: FindTModelByIdentifierQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindTModelByIdentifierQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindTModelByIdentifierQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindTModelByIdentifierQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -75,7 +75,7 @@
try
{
- log.debug("select from TMODEL & TMODEL_IDENTIFIER tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
1.4 +1 -1 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByDiscoveryURLQuery.java
Index: FindBusinessByDiscoveryURLQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByDiscoveryURLQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindBusinessByDiscoveryURLQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindBusinessByDiscoveryURLQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -78,7 +78,7 @@
try
{
- log.debug("select from BUSINESS_ENTITY & DISCOVERY_URL tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
1.4 +1 -1 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByCategoryQuery.java
Index: FindBusinessByCategoryQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByCategoryQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindBusinessByCategoryQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindBusinessByCategoryQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -75,7 +75,7 @@
try
{
- log.debug("select from BUSINESS_ENTITY & BUSINESS_CATEGORY tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
1.4 +5 -5 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByNameQuery.java
Index: FindBusinessByNameQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByNameQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindBusinessByNameQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindBusinessByNameQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -74,10 +74,10 @@
appendWhere(sql,names,qualifiers);
appendIn(sql,keysIn);
appendOrderBy(sql,qualifiers);
-
+
try
{
- log.debug("select from BUSINESS_ENTITY & BUSINESS_NAME tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
@@ -134,7 +134,7 @@
if (qualifiers == null) // default
{
sql.append("(UPPER(NAME) LIKE ?");
- sql.addValue(text.toUpperCase()+"%");
+ sql.addValue(text.endsWith("%") ? text.toUpperCase() : text.toUpperCase()+"%");
}
else if ((qualifiers.caseSensitiveMatch) && (qualifiers.exactNameMatch))
{
@@ -149,12 +149,12 @@
else if ((qualifiers.caseSensitiveMatch) && (!qualifiers.exactNameMatch))
{
sql.append("(NAME LIKE ?");
- sql.addValue(text+"%");
+ sql.addValue(text.endsWith("%") ? text : text+"%");
}
else if ((!qualifiers.caseSensitiveMatch) && (!qualifiers.exactNameMatch))
{
sql.append("(UPPER(NAME) LIKE ?");
- sql.addValue(text.toUpperCase()+"%");
+ sql.addValue(text.endsWith("%") ? text.toUpperCase() : text.toUpperCase()+"%");
}
if ((lang != null) && (lang.length() > 0))
1.2 +1 -1 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBindingByCategoryQuery.java
Index: FindBindingByCategoryQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBindingByCategoryQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FindBindingByCategoryQuery.java 30 Apr 2004 03:49:26 -0000 1.1
+++ FindBindingByCategoryQuery.java 1 May 2004 00:55:12 -0000 1.2
@@ -79,7 +79,7 @@
try
{
- log.debug("select from BINDING_TEMPLATE & BINDING_CATEGORY tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
1.4 +1 -1 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindServiceByTModelKeyQuery.java
Index: FindServiceByTModelKeyQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindServiceByTModelKeyQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindServiceByTModelKeyQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindServiceByTModelKeyQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -75,7 +75,7 @@
try
{
- log.debug("select from BUSINESS_SERVICE, BINDING_TEMPLATE & TMODEL_INSTANCE_INFO tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
1.4 +1 -1 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByIdentifierQuery.java
Index: FindBusinessByIdentifierQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByIdentifierQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindBusinessByIdentifierQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindBusinessByIdentifierQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -75,7 +75,7 @@
try
{
- log.debug("select from BUSINESS_ENTITY & BUSINESS_IDENTIFIER tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
1.4 +1 -1 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindServiceByCategoryQuery.java
Index: FindServiceByCategoryQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindServiceByCategoryQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindServiceByCategoryQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindServiceByCategoryQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -79,7 +79,7 @@
try
{
- log.debug("select from BUSINESS_SERVICE & SERVICE_CATEGORY tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
1.4 +1 -1 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBindingByTModelKeyQuery.java
Index: FindBindingByTModelKeyQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBindingByTModelKeyQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindBindingByTModelKeyQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindBindingByTModelKeyQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -74,7 +74,7 @@
try
{
- log.debug("select from BINDING_TEMPLATE & TMODEL_INSTANCE_INFO tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
1.4 +5 -5 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindTModelByNameQuery.java
Index: FindTModelByNameQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindTModelByNameQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindTModelByNameQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindTModelByNameQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -72,12 +72,12 @@
DynamicQuery sql = new DynamicQuery(selectSQL);
appendWhere(sql,name,qualifiers);
appendIn(sql,name,keysIn);
- appendOrderBy(sql,qualifiers);
-
+ appendOrderBy(sql,qualifiers);
+
try
{
- log.debug("select from TMODEL table:\n\n\t" + sql.toString() + "\n");
-
+ log.debug(sql.toString());
+
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
@@ -124,7 +124,7 @@
else
{
sql.append("WHERE M.NAME LIKE ? ");
- sql.append(name+"% ");
+ sql.addValue(name.endsWith("%") ? name : name+"%");
}
}
1.4 +1 -1 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindPublisherByNameQuery.java
Index: FindPublisherByNameQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindPublisherByNameQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindPublisherByNameQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindPublisherByNameQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -76,7 +76,7 @@
try
{
- log.debug("select from PUBLISHER table:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();
1.4 +1 -1 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByTModelKeyQuery.java
Index: FindBusinessByTModelKeyQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByTModelKeyQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FindBusinessByTModelKeyQuery.java 30 Apr 2004 03:49:26 -0000 1.3
+++ FindBusinessByTModelKeyQuery.java 1 May 2004 00:55:12 -0000 1.4
@@ -78,7 +78,7 @@
try
{
- log.debug("select from BUSINESS_ENTITY, BUSINESS_SERVICE, BINDING_TEMPLATE & TMODEL_INSTANCE_INFO tables:\n\n\t" + sql.toString() + "\n");
+ log.debug(sql.toString());
statement = sql.buildPreparedStatement(connection);
resultSet = statement.executeQuery();