equal
deleted
inserted
replaced
5 |
5 |
6 from shutil import rmtree |
6 from shutil import rmtree |
7 import atexit |
7 import atexit |
8 from ngdatabase.mysql import Server, createConfig, Database |
8 from ngdatabase.mysql import Server, createConfig, Database |
9 |
9 |
10 from iro.model import schema, setEngine |
10 from iro.model import schema, setEngine, setPool |
11 from iro.model.utils import WithSession |
11 from iro.model.utils import WithSession |
12 from iro.model.schema import Base |
12 from iro.model.schema import Base |
13 |
13 |
14 from iro.controller.pool import dbPool |
14 from iro.controller.pool import dbPool |
15 |
15 |
66 self.server.create() |
66 self.server.create() |
67 self.server.start() |
67 self.server.start() |
68 self.db.create() |
68 self.db.create() |
69 Base.metadata.create_all(self.engine) |
69 Base.metadata.create_all(self.engine) |
70 setEngine(self.engine) |
70 setEngine(self.engine) |
|
71 setPool(dbPool) |
71 self.vaild = True |
72 self.vaild = True |
72 |
73 |
73 |
74 |
74 md=ModuleData() |
75 md=ModuleData() |
75 atexit.register(md.close) |
76 atexit.register(md.close) |