Commit 9e632546 authored by Dr.李's avatar Dr.李

remove filter conditions on universe

parent 4440b488
...@@ -18,7 +18,6 @@ class Universe(object): ...@@ -18,7 +18,6 @@ class Universe(object):
def __init__(self, def __init__(self,
name, name,
base_universe: Iterable[str]=None, base_universe: Iterable[str]=None,
filter_cond=None,
include_universe: Iterable[str]=None, include_universe: Iterable[str]=None,
exclude_universe: Iterable[str]=None, exclude_universe: Iterable[str]=None,
include_codes: Iterable[str]=None, include_codes: Iterable[str]=None,
...@@ -30,7 +29,6 @@ class Universe(object): ...@@ -30,7 +29,6 @@ class Universe(object):
self.exclude_universe = exclude_universe self.exclude_universe = exclude_universe
self.include_codes = include_codes self.include_codes = include_codes
self.exclude_codes = exclude_codes self.exclude_codes = exclude_codes
self.filter_cond = filter_cond
def query(self, ref_date): def query(self, ref_date):
query = select([UniverseTable.Code]).distinct() query = select([UniverseTable.Code]).distinct()
...@@ -57,14 +55,9 @@ class Universe(object): ...@@ -57,14 +55,9 @@ class Universe(object):
codes_in = UniverseTable.Code.in_(self.include_codes) codes_in = UniverseTable.Code.in_(self.include_codes)
all_or_conditions.append(codes_in) all_or_conditions.append(codes_in)
if self.filter_cond is not None:
all_and_conditions.extend([self.filter_cond])
query = query.where( query = query.where(
and_( and_(
UniverseTable.Date == ref_date, UniverseTable.Date == ref_date,
UniverseTable.Code == Uqer.Code,
UniverseTable.Date == Uqer.Date,
or_( or_(
and_(*all_and_conditions), and_(*all_and_conditions),
*all_or_conditions *all_or_conditions
......
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