Commit bda506f9 authored by Yusei Tahara's avatar Yusei Tahara

Revert "ZSQLCatalog.SQLCatalog: Ignore unknown columns in getParams() instead (c6d26af5)."

This reverts commit b78933f1.
parent fa3caa00
...@@ -206,7 +206,11 @@ class Selection(Acquisition.Implicit, Traversable, Persistent): ...@@ -206,7 +206,11 @@ class Selection(Acquisition.Implicit, Traversable, Persistent):
#LOG("Selection", 0, str((self.__dict__))) #LOG("Selection", 0, str((self.__dict__)))
#LOG("Selection", 0, str(method)) #LOG("Selection", 0, str(method))
#LOG('Selection', 0, "self.invert_mode = %s" % repr(self.invert_mode)) #LOG('Selection', 0, "self.invert_mode = %s" % repr(self.invert_mode))
kw = self.getParams() if not params:
kw = self.params.copy()
else:
kw = params.copy()
kw.setdefault("ignore_unknown_columns", True)
# Always remove '-C'-named parameter. # Always remove '-C'-named parameter.
kw.pop('-C', None) kw.pop('-C', None)
if self.invert_mode is not 0: if self.invert_mode is not 0:
...@@ -276,10 +280,7 @@ class Selection(Acquisition.Implicit, Traversable, Persistent): ...@@ -276,10 +280,7 @@ class Selection(Acquisition.Implicit, Traversable, Persistent):
""" """
if not isinstance(self.params, dict): if not isinstance(self.params, dict):
self.params = {} self.params = {}
return self.params.copy()
params = self.params.copy()
params.setdefault("ignore_unknown_columns", True)
return params
security.declarePublic('getSortOrder') security.declarePublic('getSortOrder')
def getSortOrder(self): def getSortOrder(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment