From 4038b4da7efc5d9833bc61ca6f83021674e618c4 Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <vincent@nexedi.com>
Date: Thu, 8 Sep 2011 16:31:19 +0200
Subject: [PATCH] Revert "Allow to pass only_group_columns in kw."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit e7e8f515826ebb504e193807803c4a488e8259f0.
only_group_columns doesn't belong to this API level, only to the level
immediately below.
Acked-by: Åukasz Nowak <luke@nexedi.com>
---
product/ZSQLCatalog/SQLCatalog.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/product/ZSQLCatalog/SQLCatalog.py b/product/ZSQLCatalog/SQLCatalog.py
index 00a4064c7f..c1ee338c71 100644
--- a/product/ZSQLCatalog/SQLCatalog.py
+++ b/product/ZSQLCatalog/SQLCatalog.py
@@ -2448,8 +2448,7 @@ class Catalog(Folder,
""" Returns the number of items which satisfy the where_expression """
# Get the search method
method = getattr(self, self.sql_count_results)
- kw['only_group_columns'] = True
- return self.queryResults(method, REQUEST=REQUEST, extra_column_list=self.getCatalogSearchResultKeys(), **kw)
+ return self.queryResults(method, REQUEST=REQUEST, extra_column_list=self.getCatalogSearchResultKeys(), only_group_columns=True, **kw)
def isAdvancedSearchText(self, search_text):
return isAdvancedSearchText(search_text, self.isValidColumn)
--
2.30.9