Author: jdoyle Date: 2009-05-05 09:21:15 -0400 (Tue, 05 May 2009) New Revision: 858 Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/SalesforceConnection.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/impl/ConnectionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/QueryExecutionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionParent.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/CriteriaVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/SelectVisitor.java Log: TEIID-244 Adding queryAll capability. Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/SalesforceConnection.java =================================================================== --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/SalesforceConnection.java 2009-05-04 13:21:45 UTC (rev 857) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/SalesforceConnection.java 2009-05-05 13:21:15 UTC (rev 858) @@ -103,13 +103,13 @@ public void close() { } - public QueryResult query(String queryString, int maxBatchSize) throws ConnectorException { + public QueryResult query(String queryString, int maxBatchSize, Boolean queryAll) throws ConnectorException { if(maxBatchSize > 2000) { maxBatchSize = 2000; connectorEnv.getLogger().logInfo( Messages.getString("SalesforceQueryExecutionImpl.reduced.batch.size")); } - return connection.query(queryString, maxBatchSize); + return connection.query(queryString, maxBatchSize, queryAll); } public QueryResult queryMore(String queryLocator) throws ConnectorException { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/impl/ConnectionImpl.java =================================================================== --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/impl/ConnectionImpl.java 2009-05-04 13:21:45 UTC (rev 857) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/impl/ConnectionImpl.java 2009-05-05 13:21:15 UTC (rev 858) @@ -175,14 +175,18 @@ return result; } - public QueryResult query(String queryString, int batchSize) throws ConnectorException { + public QueryResult query(String queryString, int batchSize, Boolean queryAll) throws ConnectorException { QueryResult qr = null; QueryOptions qo = new QueryOptions(); qo.setBatchSize(batchSize); binding.setHeader(new SforceServiceLocator().getServiceName() .getNamespaceURI(), "QueryOptions", qo); try { - qr = binding.query(queryString); + if(queryAll) { + qr = binding.queryAll(queryString); + } else { + qr = binding.query(queryString); + } } catch (ApiFault ex) { throw new ConnectorException(ex.getExceptionMessage()); } catch (RemoteException ex) { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/QueryExecutionImpl.java =================================================================== --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/QueryExecutionImpl.java 2009-05-04 13:21:45 UTC (rev 857) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/QueryExecutionImpl.java 2009-05-05 13:21:15 UTC (rev 858) @@ -113,7 +113,7 @@ connectorEnv.getLogger().logInfo( getLogPreamble() + "Executing Query: " + finalQuery); - results = connection.query(finalQuery, this.context.getBatchSize()); + results = connection.query(finalQuery, this.context.getBatchSize(), visitor.getQueryAll()); } @Override Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionParent.java =================================================================== --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionParent.java 2009-05-04 13:21:45 UTC (rev 857) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionParent.java 2009-05-05 13:21:15 UTC (rev 858) @@ -123,7 +123,7 @@ } else if (visitor.hasCriteria()) { String query = visitor.getQuery(); - QueryResult results = getConnection().query(query, context.getBatchSize()); + QueryResult results = getConnection().query(query, context.getBatchSize(), Boolean.FALSE); if (null != results && results.getSize() > 0) { ArrayList<String> idList = new ArrayList<String>(results .getRecords().length); Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/CriteriaVisitor.java =================================================================== --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/CriteriaVisitor.java 2009-05-04 13:21:45 UTC (rev 857) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/CriteriaVisitor.java 2009-05-05 13:21:15 UTC (rev 858) @@ -27,7 +27,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; - import org.teiid.connector.api.ConnectorException; import org.teiid.connector.language.ICompareCriteria; import org.teiid.connector.language.IElement; @@ -42,341 +41,345 @@ import org.teiid.connector.metadata.runtime.Group; import org.teiid.connector.metadata.runtime.RuntimeMetadata; import org.teiid.connector.visitor.framework.HierarchyVisitor; - import com.metamatrix.connector.salesforce.Messages; import com.metamatrix.connector.salesforce.Util; /** - * * Parses Criteria in support of all of the ExecutionImpl classes. - * */ public abstract class CriteriaVisitor extends HierarchyVisitor implements ICriteriaVisitor { - protected static final String SELECT = "SELECT"; - protected static final String FROM = "FROM"; - protected static final String WHERE = "WHERE"; - protected static final String ORDER_BY = "ORDER BY"; - protected static final String LIMIT = "LIMIT"; - protected static final String SPACE = " "; - protected static final String EXCLUDES = "EXCLUDES"; - protected static final String INCLUDES = "includes"; - protected static final String COMMA = ","; - protected static final String SEMI = ";"; - protected static final String APOS = "'"; - protected static final String OPEN = "("; - protected static final String CLOSE = ")"; - - protected RuntimeMetadata metadata; - private HashMap<ICompareCriteria.Operator, String> comparisonOperators; - protected List<String> criteriaList = new ArrayList<String>(); - protected boolean hasCriteria; - protected Map<String, Element> columnElementsByName = new HashMap<String, Element>(); - protected List<ConnectorException> exceptions = new ArrayList<ConnectorException>(); - protected Group table; - boolean onlyIDCriteria; + protected static final String SELECT = "SELECT"; + protected static final String FROM = "FROM"; + protected static final String WHERE = "WHERE"; + protected static final String ORDER_BY = "ORDER BY"; + protected static final String LIMIT = "LIMIT"; + protected static final String SPACE = " "; + protected static final String EXCLUDES = "EXCLUDES"; + protected static final String INCLUDES = "includes"; + protected static final String COMMA = ","; + protected static final String SEMI = ";"; + protected static final String APOS = "'"; + protected static final String OPEN = "("; + protected static final String CLOSE = ")"; - public CriteriaVisitor(RuntimeMetadata metadata) { - this.metadata = metadata; - comparisonOperators = new HashMap<ICompareCriteria.Operator, String>(); - comparisonOperators.put(Operator.EQ, "="); - comparisonOperators.put(Operator.GE, ">="); - comparisonOperators.put(Operator.GT, ">"); - comparisonOperators.put(Operator.LE, "<="); - comparisonOperators.put(Operator.LT, "<"); - comparisonOperators.put(Operator.NE, "!="); - } - - @Override - public void visit(ICompareCriteria criteria) { - super.visit(criteria); - try { - addCompareCriteria(criteriaList, criteria); - boolean isAcceptableID = (Operator.EQ == criteria.getOperator() && - isIdColumn(criteria.getLeftExpression())); - setHasCriteria(true, isAcceptableID); - } catch (ConnectorException e) { - exceptions.add(e); - } - } + protected RuntimeMetadata metadata; + private HashMap<ICompareCriteria.Operator, String> comparisonOperators; + protected List<String> criteriaList = new ArrayList<String>(); + protected boolean hasCriteria; + protected Map<String, Element> columnElementsByName = new HashMap<String, Element>(); + protected List<ConnectorException> exceptions = new ArrayList<ConnectorException>(); + protected Group table; + boolean onlyIDCriteria; + protected Boolean queryAll = Boolean.FALSE; - @Override - public void visit(ILikeCriteria criteria) { - super.visit(criteria); - try { - if(isIdColumn(criteria.getLeftExpression())) { - ConnectorException e = new ConnectorException(Messages - .getString("CriteriaVisitor.LIKE.not.supported.on.Id")); - exceptions.add(e); - } - if(isMultiSelectColumn(criteria.getLeftExpression())) { - ConnectorException e = new ConnectorException(Messages - .getString("CriteriaVisitor.LIKE.not.supported.on.multiselect")); - exceptions.add(e); - } - } catch (ConnectorException e) { - exceptions.add(e); - } - criteriaList.add(criteria.toString()); - // don't check if it's ID, Id LIKE '123%' still requires a query - setHasCriteria(true, false); - } + public CriteriaVisitor( RuntimeMetadata metadata ) { + this.metadata = metadata; + comparisonOperators = new HashMap<ICompareCriteria.Operator, String>(); + comparisonOperators.put(Operator.EQ, "="); + comparisonOperators.put(Operator.GE, ">="); + comparisonOperators.put(Operator.GT, ">"); + comparisonOperators.put(Operator.LE, "<="); + comparisonOperators.put(Operator.LT, "<"); + comparisonOperators.put(Operator.NE, "!="); + } - @Override - public void visit(IInCriteria criteria) { - super.visit(criteria); - try { - IExpression lExpr = criteria.getLeftExpression(); - String columnName = lExpr.toString(); - if(columnElementsByName.containsKey(columnName)) { - Element column = (Element) columnElementsByName.get(columnName); - if(null != column.getNativeType() && (column.getNativeType().equals("multipicklist") || - column.getNativeType().equals("restrictedmultiselectpicklist"))) { - appendMultiselectIn(column, criteria); - } else { - appendCriteria(criteriaList, criteria); - } - } - setHasCriteria(true, isIdColumn(criteria.getLeftExpression())); - } catch (ConnectorException e) { - exceptions.add(e); - } - } - - public void parseFunction(IFunction func) { - super.visit(func); - String functionName = func.getName(); - try { - if (functionName.equalsIgnoreCase("includes")) { - generateMultiSelect(func, INCLUDES); - } else if (functionName.equalsIgnoreCase("excludes")) { - generateMultiSelect(func, EXCLUDES); - } - } catch (ConnectorException e) { - exceptions.add(e); - } - } + @Override + public void visit( ICompareCriteria criteria ) { + super.visit(criteria); + try { + addCompareCriteria(criteriaList, criteria); + boolean isAcceptableID = (Operator.EQ == criteria.getOperator() && isIdColumn(criteria.getLeftExpression())); + setHasCriteria(true, isAcceptableID); + } catch (ConnectorException e) { + exceptions.add(e); + } + } - private void generateMultiSelect(IFunction func, String funcName) throws ConnectorException { - List<IExpression> expressions = func.getParameters(); - validateFunction(expressions); - IExpression columnExpression = expressions.get(0); - Element column = ((IElement)columnExpression).getMetadataObject(); - StringBuffer criterion = new StringBuffer(); - criterion.append(column.getNameInSource()).append(SPACE).append(funcName); - addFunctionParams((ILiteral)expressions.get(1), criterion); - criteriaList.add(criterion.toString()); - } - - private void appendMultiselectIn(Element column, IInCriteria criteria) throws ConnectorException { - StringBuffer result = new StringBuffer(); - result.append(column.getNameInSource()).append(SPACE); - if(criteria.isNegated()) { - result.append(EXCLUDES).append(SPACE); - } else { - result.append(INCLUDES).append(SPACE); - } - result.append('('); - List<IExpression> rightExpressions = criteria.getRightExpressions(); - Iterator<IExpression> iter = rightExpressions.iterator(); - boolean first = true; - while(iter.hasNext()) { - IExpression rightExpression = iter.next(); - if(first) { - result.append(rightExpression.toString()); - first = false; - } else { - result.append(COMMA).append(rightExpression.toString()); - } - - } - result.append(')'); - criteriaList.add(result.toString()); - } + @Override + public void visit( ILikeCriteria criteria ) { + super.visit(criteria); + try { + if (isIdColumn(criteria.getLeftExpression())) { + ConnectorException e = new ConnectorException(Messages.getString("CriteriaVisitor.LIKE.not.supported.on.Id")); + exceptions.add(e); + } + if (isMultiSelectColumn(criteria.getLeftExpression())) { + ConnectorException e = new ConnectorException( + Messages.getString("CriteriaVisitor.LIKE.not.supported.on.multiselect")); + exceptions.add(e); + } + } catch (ConnectorException e) { + exceptions.add(e); + } + criteriaList.add(criteria.toString()); + // don't check if it's ID, Id LIKE '123%' still requires a query + setHasCriteria(true, false); + } - private void validateFunction(List<IExpression> expressions) throws ConnectorException { - if(expressions.size() != 2) { - throw new ConnectorException(Messages.getString("CriteriaVisitor.invalid.arg.count")); - } - if(!(expressions.get(0) instanceof IElement)) { - throw new ConnectorException(Messages.getString("CriteriaVisitor.function.not.column.arg")); - } - if(!(expressions.get(1) instanceof ILiteral)) { - throw new ConnectorException(Messages.getString("CriteriaVisitor.function.not.literal.arg")); - } - } + @Override + public void visit( IInCriteria criteria ) { + super.visit(criteria); + try { + IExpression lExpr = criteria.getLeftExpression(); + String columnName = lExpr.toString(); + if (columnElementsByName.containsKey(columnName)) { + Element column = (Element)columnElementsByName.get(columnName); + if (null != column.getNativeType() + && (column.getNativeType().equals("multipicklist") || column.getNativeType().equals("restrictedmultiselectpicklist"))) { + appendMultiselectIn(column, criteria); + } else { + appendCriteria(criteriaList, criteria); + } + } + setHasCriteria(true, isIdColumn(criteria.getLeftExpression())); + } catch (ConnectorException e) { + exceptions.add(e); + } + } - private void addFunctionParams(ILiteral param, - StringBuffer criterion) { - criterion.append(OPEN); - boolean first = true; - String fullParam = param.toString(); - String[] params = fullParam.split(","); - for(int i = 0; i < params.length; i++) { - String token = params[i]; - if(first) { - criterion.append(SPACE).append(Util.addSingleQuotes(token)); - first = false; - } else { - criterion.append(COMMA).append(SPACE).append(Util.addSingleQuotes(token)); - } - } - criterion.append(CLOSE); - } - - protected void addCompareCriteria(List criteriaList, - ICompareCriteria compCriteria) throws ConnectorException { - IExpression lExpr = compCriteria.getLeftExpression(); - if(lExpr instanceof IFunction) { - parseFunction((IFunction)lExpr); - } else { - IElement left = (IElement) lExpr; - Element column = left.getMetadataObject(); - String columnName = column.getNameInSource(); - StringBuffer queryString = new StringBuffer(); - queryString.append(columnName).append(SPACE); - queryString.append(comparisonOperators.get(compCriteria.getOperator())); - queryString.append(' '); - ILiteral literal = (ILiteral) compCriteria.getRightExpression(); - if (column.getJavaType().equals(Boolean.class)) { - queryString.append(((Boolean) literal.getValue()).toString()); - } else if (column.getJavaType().equals(java.sql.Timestamp.class)) { - Timestamp datetime = (java.sql.Timestamp)literal.getValue(); - String value = Util.getSalesforceDateTimeFormat().format(datetime); - String zoneValue = Util.getTimeZoneOffsetFormat().format(datetime); - queryString.append(value).append(zoneValue.subSequence(0, 3)).append(':').append(zoneValue.subSequence(3, 5)); - } else if (column.getJavaType().equals(java.sql.Time.class)) { - String value = Util.getSalesforceDateTimeFormat().format((java.sql.Time)literal.getValue()); - queryString.append(value); - } else if (column.getJavaType().equals(java.sql.Date.class)) { - String value = Util.getSalesforceDateFormat().format((java.sql.Date)literal.getValue()); - queryString.append(value); - } else { - queryString.append(compCriteria.getRightExpression().toString()); - } - - criteriaList.add(queryString.toString()); - } - } - - private void appendCriteria(List criteriaList, IInCriteria criteria) throws ConnectorException { - StringBuffer queryString = new StringBuffer(); - queryString.append(' '); - queryString.append(getValue(criteria.getLeftExpression())); - queryString.append(' '); - queryString.append("IN"); - queryString.append('('); - Element column = ((IElement)criteria.getLeftExpression()).getMetadataObject(); - boolean timeColumn = isTimeColumn(column); - boolean first = true; - Iterator iter = criteria.getRightExpressions().iterator(); - while (iter.hasNext()) { - if (!first) - queryString.append(','); - if (!timeColumn) queryString.append('\''); - queryString.append(getValue((IExpression) iter.next())); - if (!timeColumn) queryString.append('\''); - first = false; - } - queryString.append(')'); - criteriaList.add(queryString.toString()); - } + public void parseFunction( IFunction func ) { + super.visit(func); + String functionName = func.getName(); + try { + if (functionName.equalsIgnoreCase("includes")) { + generateMultiSelect(func, INCLUDES); + } else if (functionName.equalsIgnoreCase("excludes")) { + generateMultiSelect(func, EXCLUDES); + } + } catch (ConnectorException e) { + exceptions.add(e); + } + } - private boolean isTimeColumn(Element column) throws ConnectorException { - boolean result = false; - if (column.getJavaType().equals(java.sql.Timestamp.class) - || column.getJavaType().equals(java.sql.Time.class) - || column.getJavaType().equals(java.sql.Date.class)) { - result = true; - } - return result; - } + private void generateMultiSelect( IFunction func, + String funcName ) throws ConnectorException { + List<IExpression> expressions = func.getParameters(); + validateFunction(expressions); + IExpression columnExpression = expressions.get(0); + Element column = ((IElement)columnExpression).getMetadataObject(); + StringBuffer criterion = new StringBuffer(); + criterion.append(column.getNameInSource()).append(SPACE).append(funcName); + addFunctionParams((ILiteral)expressions.get(1), criterion); + criteriaList.add(criterion.toString()); + } - private String getValue(IExpression expr) throws ConnectorException { - String result; - if (expr instanceof IElement) { - IElement element = (IElement) expr; - Element element2 = element.getMetadataObject(); - result = element2.getNameInSource(); - } else if (expr instanceof ILiteral) { - ILiteral literal = (ILiteral) expr; - result = literal.getValue().toString(); - } else { - throw new RuntimeException( - "unknown type in SalesforceQueryExecution.getValue(): " - + expr.toString()); - } - return result; - } + private void appendMultiselectIn( Element column, + IInCriteria criteria ) throws ConnectorException { + StringBuffer result = new StringBuffer(); + result.append(column.getNameInSource()).append(SPACE); + if (criteria.isNegated()) { + result.append(EXCLUDES).append(SPACE); + } else { + result.append(INCLUDES).append(SPACE); + } + result.append('('); + List<IExpression> rightExpressions = criteria.getRightExpressions(); + Iterator<IExpression> iter = rightExpressions.iterator(); + boolean first = true; + while (iter.hasNext()) { + IExpression rightExpression = iter.next(); + if (first) { + result.append(rightExpression.toString()); + first = false; + } else { + result.append(COMMA).append(rightExpression.toString()); + } - protected void loadColumnMetadata(IGroup group) throws ConnectorException { - table = group.getMetadataObject(); - String supportsQuery = (String) table.getProperties().get( - "Supports Query"); - if (!Boolean.valueOf(supportsQuery)) { - throw new ConnectorException( - table.getNameInSource() - + " " - + Messages - .getString("CriteriaVisitor.query.not.supported")); - } - List<Element> columnIds = table.getChildren(); - for (Element element : columnIds) { - String name = table.getName() + '.' - + element.getName(); - columnElementsByName.put(name, element); - } - } - - protected boolean isIdColumn(IExpression expression) - throws ConnectorException { - boolean result = false; - if (expression instanceof IElement) { - Element element = ((IElement) expression).getMetadataObject(); - String nameInSource = element.getNameInSource(); - if (nameInSource.equalsIgnoreCase("id")) { - result = true; - } - } - return result; - } + } + result.append(')'); + criteriaList.add(result.toString()); + } - protected boolean isMultiSelectColumn(IExpression expression) - throws ConnectorException { - boolean result = false; - if (expression instanceof IElement) { - Element element = ((IElement) expression).getMetadataObject(); - String nativeType = element.getNativeType(); - if (nativeType.equalsIgnoreCase("multipicklist") || - nativeType.equalsIgnoreCase("restrictedmultiselectpicklist")) { - result = true; - } - } - return result; - } - - public boolean hasCriteria() { - return hasCriteria; - } + private void validateFunction( List<IExpression> expressions ) throws ConnectorException { + if (expressions.size() != 2) { + throw new ConnectorException(Messages.getString("CriteriaVisitor.invalid.arg.count")); + } + if (!(expressions.get(0) instanceof IElement)) { + throw new ConnectorException(Messages.getString("CriteriaVisitor.function.not.column.arg")); + } + if (!(expressions.get(1) instanceof ILiteral)) { + throw new ConnectorException(Messages.getString("CriteriaVisitor.function.not.literal.arg")); + } + } - public void setHasCriteria(boolean hasCriteria, boolean isIdCriteria) { - if(isIdCriteria) { - if(hasCriteria()) { - this.onlyIDCriteria = false; - } else { - this.onlyIDCriteria = true; - } - } else if (this.onlyIDCriteria) { - this.onlyIDCriteria = false; - } - this.hasCriteria = hasCriteria; - } + private void addFunctionParams( ILiteral param, + StringBuffer criterion ) { + criterion.append(OPEN); + boolean first = true; + String fullParam = param.toString(); + String[] params = fullParam.split(","); + for (int i = 0; i < params.length; i++) { + String token = params[i]; + if (first) { + criterion.append(SPACE).append(Util.addSingleQuotes(token)); + first = false; + } else { + criterion.append(COMMA).append(SPACE).append(Util.addSingleQuotes(token)); + } + } + criterion.append(CLOSE); + } - public boolean hasOnlyIDCriteria() { - return this.onlyIDCriteria; - } + protected void addCompareCriteria( List criteriaList, + ICompareCriteria compCriteria ) throws ConnectorException { + IExpression lExpr = compCriteria.getLeftExpression(); + if (lExpr instanceof IFunction) { + parseFunction((IFunction)lExpr); + } else { + IElement left = (IElement)lExpr; + Element column = left.getMetadataObject(); + String columnName = column.getNameInSource(); + StringBuffer queryString = new StringBuffer(); + queryString.append(columnName).append(SPACE); + queryString.append(comparisonOperators.get(compCriteria.getOperator())); + queryString.append(' '); + ILiteral literal = (ILiteral)compCriteria.getRightExpression(); + if (column.getJavaType().equals(Boolean.class)) { + queryString.append(((Boolean)literal.getValue()).toString()); + } else if (column.getJavaType().equals(java.sql.Timestamp.class)) { + Timestamp datetime = (java.sql.Timestamp)literal.getValue(); + String value = Util.getSalesforceDateTimeFormat().format(datetime); + String zoneValue = Util.getTimeZoneOffsetFormat().format(datetime); + queryString.append(value).append(zoneValue.subSequence(0, 3)).append(':').append(zoneValue.subSequence(3, 5)); + } else if (column.getJavaType().equals(java.sql.Time.class)) { + String value = Util.getSalesforceDateTimeFormat().format((java.sql.Time)literal.getValue()); + queryString.append(value); + } else if (column.getJavaType().equals(java.sql.Date.class)) { + String value = Util.getSalesforceDateFormat().format((java.sql.Date)literal.getValue()); + queryString.append(value); + } else { + queryString.append(compCriteria.getRightExpression().toString()); + } - public String getTableName() throws ConnectorException { - return table.getNameInSource(); - } + criteriaList.add(queryString.toString()); + + if (columnName.equals("IsDeleted")) { + ILiteral isDeletedLiteral = (ILiteral)compCriteria.getRightExpression(); + Boolean isDeleted = (Boolean)isDeletedLiteral.getValue(); + if (isDeleted) { + this.queryAll = isDeleted; + } + } + } + } + + private void appendCriteria( List criteriaList, + IInCriteria criteria ) throws ConnectorException { + StringBuffer queryString = new StringBuffer(); + queryString.append(' '); + queryString.append(getValue(criteria.getLeftExpression())); + queryString.append(' '); + queryString.append("IN"); + queryString.append('('); + Element column = ((IElement)criteria.getLeftExpression()).getMetadataObject(); + boolean timeColumn = isTimeColumn(column); + boolean first = true; + Iterator iter = criteria.getRightExpressions().iterator(); + while (iter.hasNext()) { + if (!first) queryString.append(','); + if (!timeColumn) queryString.append('\''); + queryString.append(getValue((IExpression)iter.next())); + if (!timeColumn) queryString.append('\''); + first = false; + } + queryString.append(')'); + criteriaList.add(queryString.toString()); + } + + private boolean isTimeColumn( Element column ) throws ConnectorException { + boolean result = false; + if (column.getJavaType().equals(java.sql.Timestamp.class) || column.getJavaType().equals(java.sql.Time.class) + || column.getJavaType().equals(java.sql.Date.class)) { + result = true; + } + return result; + } + + private String getValue( IExpression expr ) throws ConnectorException { + String result; + if (expr instanceof IElement) { + IElement element = (IElement)expr; + Element element2 = element.getMetadataObject(); + result = element2.getNameInSource(); + } else if (expr instanceof ILiteral) { + ILiteral literal = (ILiteral)expr; + result = literal.getValue().toString(); + } else { + throw new RuntimeException("unknown type in SalesforceQueryExecution.getValue(): " + expr.toString()); + } + return result; + } + + protected void loadColumnMetadata( IGroup group ) throws ConnectorException { + table = group.getMetadataObject(); + String supportsQuery = (String)table.getProperties().get("Supports Query"); + if (!Boolean.valueOf(supportsQuery)) { + throw new ConnectorException(table.getNameInSource() + " " + + Messages.getString("CriteriaVisitor.query.not.supported")); + } + List<Element> columnIds = table.getChildren(); + for (Element element : columnIds) { + String name = table.getName() + '.' + element.getName(); + columnElementsByName.put(name, element); + + // influences queryAll behavior + if (element.getNameInSource().equals("IsDeleted")) { + Boolean isDeleted = (Boolean)element.getDefaultValue(); + if (null != isDeleted && Boolean.TRUE == isDeleted) { + this.queryAll = isDeleted; + } + } + } + } + + protected boolean isIdColumn( IExpression expression ) throws ConnectorException { + boolean result = false; + if (expression instanceof IElement) { + Element element = ((IElement)expression).getMetadataObject(); + String nameInSource = element.getNameInSource(); + if (nameInSource.equalsIgnoreCase("id")) { + result = true; + } + } + return result; + } + + protected boolean isMultiSelectColumn( IExpression expression ) throws ConnectorException { + boolean result = false; + if (expression instanceof IElement) { + Element element = ((IElement)expression).getMetadataObject(); + String nativeType = element.getNativeType(); + if (nativeType.equalsIgnoreCase("multipicklist") || nativeType.equalsIgnoreCase("restrictedmultiselectpicklist")) { + result = true; + } + } + return result; + } + + public boolean hasCriteria() { + return hasCriteria; + } + + public void setHasCriteria( boolean hasCriteria, + boolean isIdCriteria ) { + if (isIdCriteria) { + if (hasCriteria()) { + this.onlyIDCriteria = false; + } else { + this.onlyIDCriteria = true; + } + } else if (this.onlyIDCriteria) { + this.onlyIDCriteria = false; + } + this.hasCriteria = hasCriteria; + } + + public boolean hasOnlyIDCriteria() { + return this.onlyIDCriteria; + } + + public String getTableName() throws ConnectorException { + return table.getNameInSource(); + } } Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/SelectVisitor.java =================================================================== --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/SelectVisitor.java 2009-05-04 13:21:45 UTC (rev 857) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/SelectVisitor.java 2009-05-05 13:21:15 UTC (rev 858) @@ -192,4 +192,9 @@ return idIndex; } + + public Boolean getQueryAll() { + return queryAll; + } + }