Update of /var/cvs/src/org/mmbase/storage/search/implementation/database
In directory james.mmbase.org:/tmp/cvs-serv31941/database
Modified Files:
PostgreSqlSqlHandler.java
Log Message:
MMB-1036
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/search/implementation/database
See also: http://www.mmbase.org/jira/browse/MMB-1036
Index: PostgreSqlSqlHandler.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/search/implementation/database/PostgreSqlSqlHandler.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- PostgreSqlSqlHandler.java 12 Jun 2007 10:59:41 -0000 1.33
+++ PostgreSqlSqlHandler.java 25 Nov 2008 13:20:53 -0000 1.34
@@ -36,7 +36,7 @@
* </ul>
*
* @author Rob van Maris
- * @version $Id: PostgreSqlSqlHandler.java,v 1.33 2007/06/12 10:59:41 michiel
Exp $
+ * @version $Id: PostgreSqlSqlHandler.java,v 1.34 2008/11/25 13:20:53 michiel
Exp $
* @since MMBase-1.7
*/
public class PostgreSqlSqlHandler extends BasicSqlHandler implements
SqlHandler {
@@ -75,8 +75,7 @@
}
// javadoc is inherited
- @Override
- public int getSupportLevel(int feature, SearchQuery query) throws
SearchQueryException {
+ @Override public int getSupportLevel(int feature, SearchQuery query)
throws SearchQueryException {
int result;
switch (feature) {
case SearchQueryHandler.FEATURE_MAX_NUMBER:
@@ -86,11 +85,9 @@
case SearchQueryHandler.FEATURE_OFFSET:
result = SearchQueryHandler.SUPPORT_OPTIMAL;
break;
- /*
case SearchQueryHandler.FEATURE_REGEXP:
result = SearchQueryHandler.SUPPORT_OPTIMAL;
break;
- */
default:
result = super.getSupportLevel(feature, query);
}
@@ -98,8 +95,7 @@
}
- @Override
- protected boolean useLower(FieldCompareConstraint constraint) {
+ @Override protected boolean useLower(FieldCompareConstraint constraint) {
if (constraint.getOperator() == FieldCompareConstraint.LIKE) {
return false;
} else {
@@ -108,8 +104,7 @@
}
- @Override
- protected StringBuilder appendLikeOperator(StringBuilder sb, boolean
caseSensitive) {
+ @Override protected StringBuilder appendLikeOperator(StringBuilder sb,
boolean caseSensitive) {
if (caseSensitive) {
sb.append(" LIKE ");
} else {
@@ -124,8 +119,7 @@
* UPPER(fieldname). This is mainly very bad if the query is also
distinct. (ERROR: for SELECT
* DISTINCT, ORDER BY expressions must appear in select list), may occur.
*/
- @Override
- protected StringBuilder appendSortOrderField(StringBuilder sb, SortOrder
sortOrder, boolean multipleSteps, SearchQuery query) {
+ @Override protected StringBuilder appendSortOrderField(StringBuilder sb,
SortOrder sortOrder, boolean multipleSteps, SearchQuery query) {
if (localeMakesCaseInsensitive) {
if (sortOrder.isCaseSensitive()) {
log.warn("Don't now how to sort case sensitively if the locale
make case insensitive in Postgresql for " + sortOrder + " it will be ignored.");
@@ -145,8 +139,8 @@
}
}
}
- /*
- protected StringBuilder appendRegularExpressionOperator(StringBuilder sb,
boolean caseSensitive) {
+
+ @Override protected StringBuilder
appendRegularExpressionOperator(StringBuilder sb, boolean caseSensitive) {
if (caseSensitive) {
sb.append(" ~ ");
} else {
@@ -154,7 +148,6 @@
}
return sb;
}
- */
/**
* <a
href="http://www.postgresql.org/docs/7.4/static/functions-datetime.html";>date
time
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
