Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BSDDB: renamed filter to where; un hash result names

Browse Source
This commit is contained in:
Doug Blank
2016-01-25 21:58:01 -05:00
parent 4463d8850c
commit 5e84b3b1d6
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gramps/gen/db/base.py
View File

@@ -1877,8 +1877,8 @@ class DbWriteBase(DbReadBase):
else: else:
raise ValueError("invalid instance type: %s" % instance.__class__.__name__) raise ValueError("invalid instance type: %s" % instance.__class__.__name__)
def select(self, table, fields=None, start=0, limit=50, def select(self, table, fields=None, start=0, limit=-1,
filter=None, order_by=None): where=None, order_by=None):
""" """
Default implementation of a select for those databases Default implementation of a select for those databases
that don't support SQL. Returns a list of dicts, total, that don't support SQL. Returns a list of dicts, total,
@@ -1888,19 +1888,21 @@ class DbWriteBase(DbReadBase):
fields - used by object.get_field() fields - used by object.get_field()
start - position to start start - position to start
limit - count to get; -1 for all limit - count to get; -1 for all
filter - (field, SQL string_operator, value) | where - (field, SQL string_operator, value) |
["AND", [filter, filter, ...]] | ["AND", [where, where, ...]] |
["OR", [filter, filter, ...]] | ["OR", [where, where, ...]] |
["NOT", filter] ["NOT", where]
order_by - [[fieldname, "ASC" | "DESC"], ...] order_by - [[fieldname, "ASC" | "DESC"], ...]
""" """
class Result(list): class Result(list):
""" """
A list rows of just matching for this page, with total = all, A list rows of just matching for this page, with total = all,
and time = time to select. time = time to select, expanded (unpickled), query (N/A).
""" """
total = 0 total = 0
time = 0.0 time = 0.0
expanded = True
query = None
def compare(v, op, value): def compare(v, op, value):
""" """
Compare values in a SQL-like way Compare values in a SQL-like way
@@ -1958,7 +1960,7 @@ class DbWriteBase(DbReadBase):
evaluate_values(exprs, item, db, table, env) evaluate_values(exprs, item, db, table, env)
elif len(condition) == 3: # (name, op, value) elif len(condition) == 3: # (name, op, value)
(name, op, value) = condition (name, op, value) = condition
# just the ones we need for filter # just the ones we need for where
hname = self._hash_name(table, name) hname = self._hash_name(table, name)
if hname not in env: if hname not in env:
value = item.get_field(name, db, ignore_errors=True) value = item.get_field(name, db, ignore_errors=True)
@@ -1999,33 +2001,33 @@ class DbWriteBase(DbReadBase):
selected = 0 selected = 0
result = Result() result = Result()
start_time = time.time() start_time = time.time()
if filter: if where:
for item in data: for item in data:
# have to evaluate all, because there is a filter # have to evaluate all, because there is a where
row = {} row = {}
env = {} env = {}
# Go through all fliters and evaluate the fields: # Go through all fliters and evaluate the fields:
evaluate_values(filter, item, self, table, env) evaluate_values(where, item, self, table, env)
matched = evaluate_truth(filter, item, self, table, env) matched = evaluate_truth(where, item, self, table, env)
if matched: if matched:
if selected < limit and start <= position: if ((selected < limit) or (limit == -1)) and start <= position:
# now, we get all of the fields # now, we get all of the fields
for field in fields: for field in fields:
value = item.get_field(field, self, ignore_errors=True) value = item.get_field(field, self, ignore_errors=True)
row[field] = value row[field.replace("__", ".")] = value
selected += 1 selected += 1
result.append(row) result.append(row)
position += 1 position += 1
result.total = position result.total = position
else: # no filter else: # no where
for item in data: for item in data:
if position >= start: if position >= start:
if selected >= limit: if ((selected >= limit) and (limit != -1)):
break break
row = {} row = {}
for field in fields: for field in fields:
value = item.get_field(field, self, ignore_errors=True) value = item.get_field(field, self, ignore_errors=True)
row[field] = value row[field.replace("__", ".")] = value
result.append(row) result.append(row)
selected += 1 selected += 1
position += 1 position += 1
@@ -2035,7 +2037,7 @@ class DbWriteBase(DbReadBase):
def _hash_name(self, table, name): def _hash_name(self, table, name):
""" """
Used in filter to eval expressions involving selected Used in SQL functions to eval expressions involving selected
data. data.
""" """
name = self._tables[table]["class_func"].get_field_alias(name) name = self._tables[table]["class_func"].get_field_alias(name)