@@ -107,13 +107,13 @@ def set_up(self, engine=None, metadata=None, table_name="flask_usage",
107107 sql .Column ('remote_addr' , sql .String (24 )),
108108 sql .Column ('xforwardedfor' , sql .String (24 )),
109109 sql .Column ('authorization' , sql .Boolean ),
110- sql .Column ('country' , sql .String (64 ), nullable = True ),
111110 sql .Column ('ip_info' , postgresql .JSONB ),
112111 sql .Column ('path' , sql .String (128 )),
113112 sql .Column ('speed' , sql .Float ),
114113 sql .Column ('datetime' , sql .DateTime ),
115114 sql .Column ('username' , sql .String (128 )),
116- sql .Column ('track_var' , sql .String (128 ))
115+ sql .Column ('track_var' , sql .String (128 )),
116+ sql .Column ('country' , sql .String (64 ), nullable = True ),
117117 )
118118 # Create the table if it does not exist
119119 self .track_table .create (bind = self ._eng )
@@ -154,13 +154,13 @@ def store(self, data):
154154 remote_addr = data ["remote_addr" ],
155155 xforwardedfor = data ["xforwardedfor" ],
156156 authorization = data ["authorization" ],
157- country = data ["country" ],
158157 ip_info = data ["ip_info" ],
159158 path = data ["path" ],
160159 speed = data ["speed" ],
161160 datetime = utcdatetime ,
162161 username = data ["username" ],
163- track_var = json .dumps (data ["track_var" ], ensure_ascii = False )
162+ track_var = json .dumps (data ["track_var" ], ensure_ascii = False ),
163+ country = data ["country" ],
164164 )
165165 con .execute (stmt )
166166 return data
@@ -200,6 +200,7 @@ def _get_usage(self, start_date=None, end_date=None, limit=500, page=1):
200200 'date' : r [15 ],
201201 'username' : r [16 ],
202202 'track_var' : r [17 ] if r [17 ] != '{}' else None
203+ 'country' : r [18 ]
203204 } for r in raw_data ]
204205 return usage_data
205206
0 commit comments