Merge branch 'dev' of https://github.com/vnpy/vnpy into dev

This commit is contained in:
vn.py 2019-05-14 14:17:39 +08:00
commit 7195c4e16b
2 changed files with 4 additions and 4 deletions

View File

@ -55,7 +55,7 @@ class DbBarData(Document):
meta = { meta = {
"indexes": [ "indexes": [
{ {
"fields": ("datetime", "interval", "symbol", "exchange"), "fields": ("symbol", "exchange", "interval", "datetime"),
"unique": True, "unique": True,
} }
] ]
@ -150,7 +150,7 @@ class DbTickData(Document):
meta = { meta = {
"indexes": [ "indexes": [
{ {
"fields": ("datetime", "symbol", "exchange"), "fields": ("symbol", "exchange", "datetime"),
"unique": True, "unique": True,
} }
], ],

View File

@ -82,7 +82,7 @@ def init_models(db: Database, driver: Driver):
class Meta: class Meta:
database = db database = db
indexes = ((("datetime", "interval", "symbol", "exchange"), True),) indexes = ((("symbol", "exchange", "interval", "datetime"), True),)
@staticmethod @staticmethod
def from_bar(bar: BarData): def from_bar(bar: BarData):
@ -195,7 +195,7 @@ def init_models(db: Database, driver: Driver):
class Meta: class Meta:
database = db database = db
indexes = ((("datetime", "symbol", "exchange"), True),) indexes = ((("symbol", "exchange", "datetime"), True),)
@staticmethod @staticmethod
def from_tick(tick: TickData): def from_tick(tick: TickData):