author | Tero Marttila <terom@paivola.fi> |
Sun, 22 Dec 2013 19:03:57 +0200 | |
changeset 336 | edaa5d0aa57d |
parent 237 | 3534d31282b3 |
permissions | -rw-r--r-- |
178
f9f5e669bace
pvl.verkko: refactor into dhcp -> hosts -> web+db modules, reworking index page
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
1 |
""" |
f9f5e669bace
pvl.verkko: refactor into dhcp -> hosts -> web+db modules, reworking index page
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
2 |
SQLAlchemy Database tables model for pvl.verkko |
f9f5e669bace
pvl.verkko: refactor into dhcp -> hosts -> web+db modules, reworking index page
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
3 |
""" |
f9f5e669bace
pvl.verkko: refactor into dhcp -> hosts -> web+db modules, reworking index page
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
4 |
|
0 | 5 |
import sqlalchemy |
6 |
from sqlalchemy import * |
|
7 |
||
8 |
import logging; log = logging.getLogger('pvl.verkko.db') |
|
9 |
||
10 |
# schema |
|
11 |
metadata = MetaData() |
|
12 |
||
13 |
dhcp_hosts = Table('dhcp_hosts', metadata, |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
14 |
Column('id', Integer, primary_key=True), |
0 | 15 |
|
16 |
# unique |
|
14
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
6
diff
changeset
|
17 |
Column('ip', String, nullable=False), |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
6
diff
changeset
|
18 |
Column('mac', String, nullable=False), |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
6
diff
changeset
|
19 |
Column('gw', String, nullable=False), |
0 | 20 |
|
21 |
# updated |
|
14
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
6
diff
changeset
|
22 |
Column('first_seen', DateTime, nullable=False), |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
6
diff
changeset
|
23 |
Column('last_seen', DateTime, nullable=False), |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
6
diff
changeset
|
24 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
6
diff
changeset
|
25 |
# scalar; updated |
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
6
diff
changeset
|
26 |
Column('name', String, nullable=True), |
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
14
diff
changeset
|
27 |
Column('state', String, nullable=True), |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
14
diff
changeset
|
28 |
Column('error', String, nullable=True), |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
14
diff
changeset
|
29 |
|
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
14
diff
changeset
|
30 |
# counters |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
14
diff
changeset
|
31 |
Column('count', Integer, default=1), |
14
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
6
diff
changeset
|
32 |
|
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
6
diff
changeset
|
33 |
UniqueConstraint('ip', 'mac', 'gw'), |
0 | 34 |
) |
35 |
||
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
36 |
dhcp_leases = Table('dhcp_leases', metadata, |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
37 |
Column('id', Integer, primary_key=True), |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
38 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
39 |
Column('ip', String, nullable=False), |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
40 |
Column('mac', String, nullable=False), |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
41 |
Column('hostname', String, nullable=True), |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
42 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
43 |
Column('starts', DateTime, nullable=False), |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
44 |
Column('ends', DateTime, nullable=True), # never |
184
eef756d892e9
pvl.verkko.leases: implement ui for dhcp_leases table
Tero Marttila <terom@paivola.fi>
parents:
178
diff
changeset
|
45 |
# TODO: renewed |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
46 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
47 |
Column('state', String, nullable=True), |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
48 |
Column('next', String, nullable=True), |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
49 |
) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
50 |
|
237
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
51 |
wlan_sta = Table('wlan_sta', metadata, |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
52 |
Column('id', Integer, primary_key=True), |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
53 |
|
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
54 |
Column('ap', String, nullable=False), |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
55 |
Column('wlan', String, nullable=False), |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
56 |
Column('sta', String, nullable=False), |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
57 |
|
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
58 |
# updated |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
59 |
Column('first_seen', DateTime, nullable=False), |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
60 |
Column('last_seen', DateTime, nullable=False), |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
61 |
|
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
62 |
Column('count', Integer, default=1), |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
63 |
Column('msg', String, nullable=True), |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
64 |
|
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
65 |
UniqueConstraint('ap', 'wlan', 'sta'), |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
66 |
) |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
67 |
|
0 | 68 |
# for ORM models |
69 |
from sqlalchemy.orm import mapper, sessionmaker |
|
70 |
||
71 |
Session = sessionmaker() |
|
72 |
||
73 |
class Database (object) : |
|
74 |
""" |
|
75 |
Our underlying database. |
|
76 |
""" |
|
77 |
||
2
b0659c867226
fixup pvl.verkko.wsgi.Application + test.py/wsgi to remove default path from pvl.verkko.db
Tero Marttila <terom@paivola.fi>
parents:
1
diff
changeset
|
78 |
def __init__ (self, database) : |
b0659c867226
fixup pvl.verkko.wsgi.Application + test.py/wsgi to remove default path from pvl.verkko.db
Tero Marttila <terom@paivola.fi>
parents:
1
diff
changeset
|
79 |
""" |
b0659c867226
fixup pvl.verkko.wsgi.Application + test.py/wsgi to remove default path from pvl.verkko.db
Tero Marttila <terom@paivola.fi>
parents:
1
diff
changeset
|
80 |
database - sqlalchemy connection URI |
b0659c867226
fixup pvl.verkko.wsgi.Application + test.py/wsgi to remove default path from pvl.verkko.db
Tero Marttila <terom@paivola.fi>
parents:
1
diff
changeset
|
81 |
""" |
b0659c867226
fixup pvl.verkko.wsgi.Application + test.py/wsgi to remove default path from pvl.verkko.db
Tero Marttila <terom@paivola.fi>
parents:
1
diff
changeset
|
82 |
|
0 | 83 |
self.engine = create_engine(database, |
84 |
echo = (log.isEnabledFor(logging.DEBUG)), |
|
85 |
) |
|
86 |
||
87 |
# ORM |
|
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
14
diff
changeset
|
88 |
def session (self) : |
40 | 89 |
""" |
90 |
Return a new ORM session bound to our engine. |
|
91 |
||
92 |
XXX: session lifetimes? Explicit close? |
|
93 |
""" |
|
94 |
||
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
14
diff
changeset
|
95 |
return Session(bind=self.engine) |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
14
diff
changeset
|
96 |
|
0 | 97 |
# SQL |
40 | 98 |
def connect (self) : |
99 |
return self.engine.connect() |
|
100 |
||
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
101 |
def execute (self, query) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
102 |
return self.engine.execute(query) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
103 |
|
0 | 104 |
def select (self, query) : |
14
02c21749cb4f
pvl.verkko: re-add last_msg back to db, implement state, seen filtering in web frontend
Tero Marttila <terom@paivola.fi>
parents:
6
diff
changeset
|
105 |
return self.engine.execute(query) |
0 | 106 |
|
107 |
def get (self, query) : |
|
108 |
""" |
|
109 |
Fetch a single row. |
|
110 |
||
111 |
XXX: returning None if not found |
|
112 |
""" |
|
113 |
||
114 |
return self.select(query).fetchone() |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
115 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
116 |
def insert (self, insert) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
117 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
118 |
Execute given INSERT query, returning the inserted primary key. |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
119 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
120 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
121 |
result = self.engine.execute(insert) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
122 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
123 |
id, = result.inserted_primary_key |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
124 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
125 |
return id |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
126 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
127 |
def update (self, update) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
128 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
129 |
Execute given UPDATE query, returning the number of matched rows. |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
130 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
131 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
132 |
result = self.engine.execute(update) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
133 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
134 |
return result.rowcount |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
135 |
|
237
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
136 |
# command-line |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
137 |
import optparse |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
138 |
import sys |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
139 |
|
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
140 |
def parser (parser, table=None) : |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
141 |
parser.set_defaults( |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
142 |
create_table = table, |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
143 |
) |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
144 |
parser = optparse.OptionGroup(parser, "Verkko Database") |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
145 |
parser.add_option('--database', metavar='URI', |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
146 |
help="Connect to given database") |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
147 |
|
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
148 |
if table is not None : |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
149 |
parser.add_option('--create', action='store_true', |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
150 |
help="Initialize database") |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
151 |
|
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
152 |
return parser |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
153 |
|
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
154 |
def apply (options, required=True) : |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
155 |
# db |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
156 |
if not options.database and required : |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
157 |
log.error("No database given") |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
158 |
sys.exit(1) |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
159 |
|
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
160 |
log.info("Open up database: %s", options.database) |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
161 |
db = Database(options.database) |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
162 |
|
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
163 |
if options.create_table is not None and options.create : |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
164 |
log.info("Creating database tables: %s", options.create_table) |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
165 |
options.create_table.create(db.engine, checkfirst=True) |
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
166 |
|
3534d31282b3
pvl.verkko.db: support command-line parser/apply
Tero Marttila <terom@paivola.fi>
parents:
184
diff
changeset
|
167 |
return db |