Commit b81fc005 authored by Dr.李's avatar Dr.李

added short_name

parent cf325544
...@@ -348,7 +348,7 @@ class SqlEngine(object): ...@@ -348,7 +348,7 @@ class SqlEngine(object):
joined_tables.add(t.__table__.name) joined_tables.add(t.__table__.name)
query = select( query = select(
[Market.trade_date, Market.code, Market.chgPct] + list(factor_cols.keys())) \ [Market.trade_date, Market.code, Market.chgPct, Market.secShortName] + list(factor_cols.keys())) \
.select_from(big_table).where(and_(Market.trade_date.between(start_date, end_date), .select_from(big_table).where(and_(Market.trade_date.between(start_date, end_date),
Market.code.in_(codes))) Market.code.in_(codes)))
...@@ -403,7 +403,7 @@ class SqlEngine(object): ...@@ -403,7 +403,7 @@ class SqlEngine(object):
universe_df = universe.query(self, start_date, end_date, dates) universe_df = universe.query(self, start_date, end_date, dates)
query = select( query = select(
[Market.trade_date, Market.code, Market.chgPct] + list(factor_cols.keys())) \ [Market.trade_date, Market.code, Market.chgPct, Market.secShortName] + list(factor_cols.keys())) \
.select_from(big_table).where( .select_from(big_table).where(
and_( and_(
Market.code.in_(universe_df.code.unique().tolist()), Market.code.in_(universe_df.code.unique().tolist()),
......
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