You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by jf...@apache.org on 2008/12/16 02:11:19 UTC
svn commit: r726908 -
/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/
Author: jfaath
Date: Mon Dec 15 17:11:19 2008
New Revision: 726908
URL: http://svn.apache.org/viewvc?rev=726908&view=rev
Log:
Fixed the queries to work with the persistence changes.
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java Mon Dec 15 17:11:19 2008
@@ -24,7 +24,8 @@
public static final String ENTITY_NAME = "BindingTemplate";
public static final String ENTITY_ALIAS = "bt";
- public static final String KEY_NAME_PARENT = "businessService." + BusinessServiceQuery.KEY_NAME;
+ public static final String ENTITY_FIELD = "bindingTemplate";
+ public static final String KEY_NAME_PARENT = BusinessServiceQuery.ENTITY_FIELD + "." + BusinessServiceQuery.KEY_NAME;
protected static String selectSQL;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java Mon Dec 15 17:11:19 2008
@@ -24,6 +24,7 @@
public static final String ENTITY_NAME = "BusinessEntity";
public static final String ENTITY_ALIAS = "be";
+ public static final String ENTITY_FIELD = "businessEntity";
protected static String selectSQL;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java Mon Dec 15 17:11:19 2008
@@ -24,7 +24,8 @@
public static final String ENTITY_NAME = "BusinessService";
public static final String ENTITY_ALIAS = "bs";
- public static final String KEY_NAME_PARENT = "businessEntity." + BusinessEntityQuery.KEY_NAME;
+ public static final String ENTITY_FIELD = "businessService";
+ public static final String KEY_NAME_PARENT = BusinessEntityQuery.ENTITY_FIELD + "." + BusinessEntityQuery.KEY_NAME;
protected static String selectSQL;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java Mon Dec 15 17:11:19 2008
@@ -70,7 +70,7 @@
qry.pad().comma().pad().append(FindBusinessByNameQuery.ENTITY_NAME_CHILD).pad().append(buildAlias(FindBusinessByNameQuery.ENTITY_NAME_CHILD)).pad();
qry.WHERE().pad().append(ENTITY_ALIAS + "." + KEY_NAME).pad();
qry.append(DynamicQuery.PREDICATE_EQUALS).pad();
- qry.append(buildAlias(FindBusinessByNameQuery.ENTITY_NAME_CHILD) + ".id." + KEY_NAME).pad();
+ qry.append(buildAlias(FindBusinessByNameQuery.ENTITY_NAME_CHILD) + "." + ENTITY_FIELD + "." + KEY_NAME).pad();
}
/*
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java Mon Dec 15 17:11:19 2008
@@ -70,7 +70,7 @@
qry.pad().comma().pad().append(FindServiceByNameQuery.ENTITY_NAME_CHILD).pad().append(buildAlias(FindServiceByNameQuery.ENTITY_NAME_CHILD)).pad();
qry.WHERE().pad().append(ENTITY_ALIAS + "." + KEY_NAME).pad();
qry.append(DynamicQuery.PREDICATE_EQUALS).pad();
- qry.append(buildAlias(FindServiceByNameQuery.ENTITY_NAME_CHILD) + ".id." + KEY_NAME).pad();
+ qry.append(buildAlias(FindServiceByNameQuery.ENTITY_NAME_CHILD) + "." + ENTITY_FIELD + "." + KEY_NAME).pad();
}
/*
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java Mon Dec 15 17:11:19 2008
@@ -129,13 +129,13 @@
if (!fq.isOrAllKeys()) {
tblCount++;
qry.comma().pad().append(ENTITY_NAME_CHILD + " " + entityAliasChild + tblCount).pad();
- thetaJoins.append(entityAliasChild + (tblCount - 1) + ".id." + KEY_NAME + " = " + entityAliasChild + tblCount + ".id." + KEY_NAME + " ");
+ thetaJoins.append(entityAliasChild + (tblCount - 1) + "." + ENTITY_FIELD + "." + KEY_NAME + " = " + entityAliasChild + tblCount + "." + ENTITY_FIELD + "." + KEY_NAME + " ");
thetaJoins.append(DynamicQuery.OPERATOR_AND + " ");
}
}
else {
qry.comma().pad().append(ENTITY_NAME_CHILD + " " + entityAliasChild + tblCount).pad();
- thetaJoins.append(ENTITY_ALIAS + "." + KEY_NAME + " = " + entityAliasChild + tblCount + ".id." + KEY_NAME + " ");
+ thetaJoins.append(ENTITY_ALIAS + "." + KEY_NAME + " = " + entityAliasChild + tblCount + "." + ENTITY_FIELD + "." + KEY_NAME + " ");
thetaJoins.append(DynamicQuery.OPERATOR_AND + " ");
}
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java Mon Dec 15 17:11:19 2008
@@ -110,7 +110,7 @@
public static void appendJoinTables(DynamicQuery qry, FindQualifiers fq, List<DiscoveryURL> discURLs) {
qry.comma().pad().append(ENTITY_NAME_CHILD + " " + entityAliasChild).pad();
qry.WHERE().pad().openParen().pad();
- qry.append(ENTITY_ALIAS + "." + KEY_NAME + " = " + entityAliasChild + ".id." + KEY_NAME + " ");
+ qry.append(ENTITY_ALIAS + "." + KEY_NAME + " = " + entityAliasChild + "." + ENTITY_FIELD + "." + KEY_NAME + " ");
qry.closeParen().pad();
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java Mon Dec 15 17:11:19 2008
@@ -42,7 +42,11 @@
private static FindEntityByIdentifierQuery findQuery;
static {
- findQuery = new FindEntityByIdentifierQuery(BusinessEntityQuery.ENTITY_NAME, BusinessEntityQuery.ENTITY_ALIAS, BusinessEntityQuery.KEY_NAME, ENTITY_NAME_CHILD);
+ findQuery = new FindEntityByIdentifierQuery(BusinessEntityQuery.ENTITY_NAME,
+ BusinessEntityQuery.ENTITY_ALIAS,
+ BusinessEntityQuery.KEY_NAME,
+ BusinessEntityQuery.ENTITY_FIELD,
+ ENTITY_NAME_CHILD);
}
public static List<?> select(EntityManager em, FindQualifiers fq, IdentifierBag identifiers, List<?> keysIn) {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java Mon Dec 15 17:11:19 2008
@@ -50,7 +50,11 @@
private static FindEntityByNamesQuery findQuery;
static {
- findQuery = new FindEntityByNamesQuery(BusinessEntityQuery.ENTITY_NAME, BusinessEntityQuery.ENTITY_ALIAS, BusinessEntityQuery.KEY_NAME, ENTITY_NAME_CHILD);
+ findQuery = new FindEntityByNamesQuery(BusinessEntityQuery.ENTITY_NAME,
+ BusinessEntityQuery.ENTITY_ALIAS,
+ BusinessEntityQuery.KEY_NAME,
+ BusinessEntityQuery.ENTITY_FIELD,
+ ENTITY_NAME_CHILD);
}
public static List<?> select(EntityManager em, FindQualifiers fq, List<Name> names, List<?> keysIn) {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java Mon Dec 15 17:11:19 2008
@@ -130,13 +130,13 @@
if (!fq.isOrAllKeys()) {
tblCount++;
qry.comma().pad().append(ENTITY_NAME_CHILD + " " + entityAliasChild + tblCount).pad();
- thetaJoins.append(entityAliasChild + (tblCount - 1) + ".id." + BindingTemplateQuery.KEY_NAME + " = " + entityAliasChild + tblCount + ".id." + BindingTemplateQuery.KEY_NAME + " ");
+ thetaJoins.append(entityAliasChild + (tblCount - 1) + "." + ENTITY_FIELD + "." + BindingTemplateQuery.KEY_NAME + " = " + entityAliasChild + tblCount + "." + ENTITY_FIELD + "." + BindingTemplateQuery.KEY_NAME + " ");
thetaJoins.append(DynamicQuery.OPERATOR_AND + " ");
}
}
else {
qry.comma().pad().append(ENTITY_NAME_CHILD + " " + entityAliasChild + tblCount).pad();
- thetaJoins.append(BindingTemplateQuery.ENTITY_ALIAS + "." + BindingTemplateQuery.KEY_NAME + " = " + entityAliasChild + tblCount + ".id." + BindingTemplateQuery.KEY_NAME + " ");
+ thetaJoins.append(BindingTemplateQuery.ENTITY_ALIAS + "." + BindingTemplateQuery.KEY_NAME + " = " + entityAliasChild + tblCount + "." + ENTITY_FIELD + "." + BindingTemplateQuery.KEY_NAME + " ");
thetaJoins.append(DynamicQuery.OPERATOR_AND + " ");
}
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java Mon Dec 15 17:11:19 2008
@@ -52,14 +52,16 @@
private String entityName;
private String entityAlias;
private String keyName;
+ private String entityField;
private String entityNameChild;
private String entityAliasChild;
private String selectSQL;
- public FindEntityByIdentifierQuery(String entityName, String entityAlias, String keyName, String entityNameChild) {
+ public FindEntityByIdentifierQuery(String entityName, String entityAlias, String keyName, String entityField, String entityNameChild) {
this.entityName = entityName;
this.entityAlias = entityAlias;
this.keyName = keyName;
+ this.entityField = entityField;
this.entityNameChild = entityNameChild;
this.entityAliasChild = buildAlias(entityNameChild);
@@ -80,6 +82,10 @@
return keyName;
}
+ public String getEntityField() {
+ return entityField;
+ }
+
public String getEntityNameChild() {
return entityNameChild;
}
@@ -235,14 +241,14 @@
else {
tblCount++;
qry.comma().pad().append(entityNameChild + " " + entityAliasChild + tblCount).pad();
- thetaJoins.append(entityAliasChild + (tblCount - 1) + ".id." + keyName + " = " + entityAliasChild + tblCount + ".id." + keyName + " ");
+ thetaJoins.append(entityAliasChild + (tblCount - 1) + "." + entityField + "." + keyName + " = " + entityAliasChild + tblCount + "." + entityField + "." + keyName + " ");
thetaJoins.append(DynamicQuery.OPERATOR_AND + " ");
}
}
else {
qry.comma().pad().append(entityNameChild + " " + entityAliasChild + tblCount).pad();
- thetaJoins.append(entityAlias + "." + keyName + " = " + entityAliasChild + tblCount + ".id." + keyName + " ");
+ thetaJoins.append(entityAlias + "." + keyName + " = " + entityAliasChild + tblCount + "." + entityField + "." + keyName + " ");
thetaJoins.append(DynamicQuery.OPERATOR_AND + " ");
}
prevTModelKey = curTModelKey;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java Mon Dec 15 17:11:19 2008
@@ -39,14 +39,16 @@
private String entityName;
private String entityAlias;
private String keyName;
+ private String entityField;
private String entityNameChild;
private String entityAliasChild;
private String selectSQL;
- public FindEntityByNamesQuery(String entityName, String entityAlias, String keyName, String entityNameChild) {
+ public FindEntityByNamesQuery(String entityName, String entityAlias, String keyName, String entityField, String entityNameChild) {
this.entityName = entityName;
this.entityAlias = entityAlias;
this.keyName = keyName;
+ this.entityField = entityField;
this.entityNameChild = entityNameChild;
this.entityAliasChild = buildAlias(entityNameChild);
@@ -66,6 +68,10 @@
public String getKeyName() {
return keyName;
}
+
+ public String getEntityField() {
+ return entityField;
+ }
public String getEntityNameChild() {
return entityNameChild;
@@ -145,7 +151,7 @@
public void appendJoinTables(DynamicQuery qry, FindQualifiers fq, List<Name> names) {
qry.comma().pad().append(entityNameChild + " " + entityAliasChild).pad();
qry.WHERE().pad().openParen().pad();
- qry.append(entityAlias + "." + keyName + " = " + entityAliasChild + ".id." + keyName + " ");
+ qry.append(entityAlias + "." + keyName + " = " + entityAliasChild + "." + entityField + "." + keyName + " ");
qry.closeParen().pad();
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java Mon Dec 15 17:11:19 2008
@@ -50,7 +50,11 @@
private static FindEntityByNamesQuery findQuery;
static {
- findQuery = new FindEntityByNamesQuery(BusinessServiceQuery.ENTITY_NAME, BusinessServiceQuery.ENTITY_ALIAS, BusinessServiceQuery.KEY_NAME, ENTITY_NAME_CHILD);
+ findQuery = new FindEntityByNamesQuery(BusinessServiceQuery.ENTITY_NAME,
+ BusinessServiceQuery.ENTITY_ALIAS,
+ BusinessServiceQuery.KEY_NAME,
+ BusinessServiceQuery.ENTITY_FIELD,
+ ENTITY_NAME_CHILD);
}
public static List<?> select(EntityManager em, FindQualifiers fq, List<Name> names, String parentKey, List<?> keysIn) {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java Mon Dec 15 17:11:19 2008
@@ -131,13 +131,13 @@
if (!fq.isOrAllKeys()) {
tblCount++;
qry.comma().pad().append(ENTITY_NAME_CHILD + " " + entityAliasChild + tblCount).pad();
- thetaJoins.append(entityAliasChild + (tblCount - 1) + ".id." + BindingTemplateQuery.KEY_NAME + " = " + entityAliasChild + tblCount + ".id." + BindingTemplateQuery.KEY_NAME + " ");
+ thetaJoins.append(entityAliasChild + (tblCount - 1) + "." + ENTITY_FIELD + "." + BindingTemplateQuery.KEY_NAME + " = " + entityAliasChild + tblCount + "." + ENTITY_FIELD + "." + BindingTemplateQuery.KEY_NAME + " ");
thetaJoins.append(DynamicQuery.OPERATOR_AND + " ");
}
}
else {
qry.comma().pad().append(ENTITY_NAME_CHILD + " " + entityAliasChild + tblCount).pad();
- thetaJoins.append(BindingTemplateQuery.ENTITY_ALIAS + "." + BindingTemplateQuery.KEY_NAME + " = " + entityAliasChild + tblCount + ".id." + BindingTemplateQuery.KEY_NAME + " ");
+ thetaJoins.append(BindingTemplateQuery.ENTITY_ALIAS + "." + BindingTemplateQuery.KEY_NAME + " = " + entityAliasChild + tblCount + "." + ENTITY_FIELD + "." + BindingTemplateQuery.KEY_NAME + " ");
thetaJoins.append(DynamicQuery.OPERATOR_AND + " ");
}
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java Mon Dec 15 17:11:19 2008
@@ -43,7 +43,11 @@
private static FindEntityByIdentifierQuery findQuery;
static {
- findQuery = new FindEntityByIdentifierQuery(TModelQuery.ENTITY_NAME, TModelQuery.ENTITY_ALIAS, TModelQuery.KEY_NAME, ENTITY_NAME_CHILD);
+ findQuery = new FindEntityByIdentifierQuery(TModelQuery.ENTITY_NAME,
+ TModelQuery.ENTITY_ALIAS,
+ TModelQuery.KEY_NAME,
+ TModelQuery.ENTITY_FIELD,
+ ENTITY_NAME_CHILD);
}
public static List<?> select(EntityManager em, FindQualifiers fq, IdentifierBag identifiers, List<?> keysIn) {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java?rev=726908&r1=726907&r2=726908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java Mon Dec 15 17:11:19 2008
@@ -24,6 +24,7 @@
public static final String ENTITY_NAME = "Tmodel";
public static final String ENTITY_ALIAS = "t";
+ public static final String ENTITY_FIELD = "tmodel";
protected static String selectSQL;
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org