Skip to content

Commit 0f6df7d

Browse files
vnpyvnpy
committed
[Mod] 优化ORM对象成员的类型声明
1 parent ddb439a commit 0f6df7d

File tree

1 file changed

+64
-64
lines changed

1 file changed

+64
-64
lines changed

‎vnpy_postgresql/postgresql_database.py‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@ class DbBarData(Model):
4343

4444
id: AutoField = AutoField()
4545

46-
symbol: str = CharField()
47-
exchange: str = CharField()
48-
datetime: datetime = DateTimeField()
49-
interval: str = CharField()
50-
51-
volume: float = FloatField()
52-
turnover: float = FloatField()
53-
open_interest: float = FloatField()
54-
open_price: float = FloatField()
55-
high_price: float = FloatField()
56-
low_price: float = FloatField()
57-
close_price: float = FloatField()
46+
symbol: CharField = CharField()
47+
exchange: CharField = CharField()
48+
datetime: DateTimeField = DateTimeField()
49+
interval: CharField = CharField()
50+
51+
volume: FloatField = FloatField()
52+
turnover: FloatField = FloatField()
53+
open_interest: FloatField = FloatField()
54+
open_price: FloatField = FloatField()
55+
high_price: FloatField = FloatField()
56+
low_price: FloatField = FloatField()
57+
close_price: FloatField = FloatField()
5858

5959
class Meta:
6060
database: PeeweePostgresqlDatabase = db
@@ -66,47 +66,47 @@ class DbTickData(Model):
6666

6767
id: AutoField = AutoField()
6868

69-
symbol: str = CharField()
70-
exchange: str = CharField()
71-
datetime: datetime = DateTimeField()
72-
73-
name: str = CharField()
74-
volume: float = FloatField()
75-
turnover: float = FloatField()
76-
open_interest: float = FloatField()
77-
last_price: float = FloatField()
78-
last_volume: float = FloatField()
79-
limit_up: float = FloatField()
80-
limit_down: float = FloatField()
81-
82-
open_price: float = FloatField()
83-
high_price: float = FloatField()
84-
low_price: float = FloatField()
85-
pre_close: float = FloatField()
86-
87-
bid_price_1: float = FloatField()
88-
bid_price_2: float = FloatField(null=True)
89-
bid_price_3: float = FloatField(null=True)
90-
bid_price_4: float = FloatField(null=True)
91-
bid_price_5: float = FloatField(null=True)
92-
93-
ask_price_1: float = FloatField()
94-
ask_price_2: float = FloatField(null=True)
95-
ask_price_3: float = FloatField(null=True)
96-
ask_price_4: float = FloatField(null=True)
97-
ask_price_5: float = FloatField(null=True)
98-
99-
bid_volume_1: float = FloatField()
100-
bid_volume_2: float = FloatField(null=True)
101-
bid_volume_3: float = FloatField(null=True)
102-
bid_volume_4: float = FloatField(null=True)
103-
bid_volume_5: float = FloatField(null=True)
104-
105-
ask_volume_1: float = FloatField()
106-
ask_volume_2: float = FloatField(null=True)
107-
ask_volume_3: float = FloatField(null=True)
108-
ask_volume_4: float = FloatField(null=True)
109-
ask_volume_5: float = FloatField(null=True)
69+
symbol: CharField = CharField()
70+
exchange: CharField = CharField()
71+
datetime: DateTimeField = DateTimeField()
72+
73+
name: CharField = CharField()
74+
volume: FloatField = FloatField()
75+
turnover: FloatField = FloatField()
76+
open_interest: FloatField = FloatField()
77+
last_price: FloatField = FloatField()
78+
last_volume: FloatField = FloatField()
79+
limit_up: FloatField = FloatField()
80+
limit_down: FloatField = FloatField()
81+
82+
open_price: FloatField = FloatField()
83+
high_price: FloatField = FloatField()
84+
low_price: FloatField = FloatField()
85+
pre_close: FloatField = FloatField()
86+
87+
bid_price_1: FloatField = FloatField()
88+
bid_price_2: FloatField = FloatField(null=True)
89+
bid_price_3: FloatField = FloatField(null=True)
90+
bid_price_4: FloatField = FloatField(null=True)
91+
bid_price_5: FloatField = FloatField(null=True)
92+
93+
ask_price_1: FloatField = FloatField()
94+
ask_price_2: FloatField = FloatField(null=True)
95+
ask_price_3: FloatField = FloatField(null=True)
96+
ask_price_4: FloatField = FloatField(null=True)
97+
ask_price_5: FloatField = FloatField(null=True)
98+
99+
bid_volume_1: FloatField = FloatField()
100+
bid_volume_2: FloatField = FloatField(null=True)
101+
bid_volume_3: FloatField = FloatField(null=True)
102+
bid_volume_4: FloatField = FloatField(null=True)
103+
bid_volume_5: FloatField = FloatField(null=True)
104+
105+
ask_volume_1: FloatField = FloatField()
106+
ask_volume_2: FloatField = FloatField(null=True)
107+
ask_volume_3: FloatField = FloatField(null=True)
108+
ask_volume_4: FloatField = FloatField(null=True)
109+
ask_volume_5: FloatField = FloatField(null=True)
110110

111111
localtime: DateTimeField = DateTimeField(null=True)
112112

@@ -120,12 +120,12 @@ class DbBarOverview(Model):
120120

121121
id: AutoField = AutoField()
122122

123-
symbol: str = CharField()
124-
exchange: str = CharField()
125-
interval: str = CharField()
126-
count: int = IntegerField()
127-
start: datetime = DateTimeField()
128-
end: datetime = DateTimeField()
123+
symbol: CharField = CharField()
124+
exchange: CharField = CharField()
125+
interval: CharField = CharField()
126+
count: IntegerField = IntegerField()
127+
start: DateTimeField = DateTimeField()
128+
end: DateTimeField = DateTimeField()
129129

130130
class Meta:
131131
database: PeeweePostgresqlDatabase = db
@@ -137,11 +137,11 @@ class DbTickOverview(Model):
137137

138138
id: AutoField = AutoField()
139139

140-
symbol: str = CharField()
141-
exchange: str = CharField()
142-
count: int = IntegerField()
143-
start: datetime = DateTimeField()
144-
end: datetime = DateTimeField()
140+
symbol: CharField = CharField()
141+
exchange: CharField = CharField()
142+
count: IntegerField = IntegerField()
143+
start: DateTimeField = DateTimeField()
144+
end: DateTimeField = DateTimeField()
145145

146146
class Meta:
147147
database: PeeweePostgresqlDatabase = db

0 commit comments

Comments
 (0)