|
a/Allura/flyway/command.py |
|
b/Allura/flyway/command.py |
|
... |
|
... |
| 35 |
if parsed_connection_url['path'] == '/':
|
35 |
if parsed_connection_url['path'] == '/':
|
| 36 |
# Find all the databases managed by the server
|
36 |
# Find all the databases managed by the server
|
| 37 |
connection = Connection(
|
37 |
connection = Connection(
|
| 38 |
parsed_connection_url['host'],
|
38 |
parsed_connection_url['host'],
|
| 39 |
parsed_connection_url['port'])
|
39 |
parsed_connection_url['port'])
|
| 40 |
databases = connection.database_names()
|
|
|
| 41 |
datastores = [ DataStore(self.options.connection_url + db)
|
40 |
datastores = [ DataStore(self.options.connection_url + db)
|
| 42 |
for db in connection.database_names()
|
41 |
for db in connection.database_names()
|
| 43 |
if db not in ('admin', 'local')]
|
42 |
if db not in ('admin', 'local')]
|
| 44 |
else:
|
43 |
else:
|
| 45 |
datastores = [ DataStore(self.options.connection_url) ]
|
44 |
datastores = [ DataStore(self.options.connection_url) ]
|
|
... |
|
... |
| 54 |
set_status(ds, self._target_versions())
|
53 |
set_status(ds, self._target_versions())
|
| 55 |
elif self.options.reset:
|
54 |
elif self.options.reset:
|
| 56 |
reset_migration(ds, dry_run=self.options.dry_run)
|
55 |
reset_migration(ds, dry_run=self.options.dry_run)
|
| 57 |
else:
|
56 |
else:
|
| 58 |
run_migration(ds, self._target_versions(), dry_run=self.options.dry_run)
|
57 |
run_migration(ds, self._target_versions(), dry_run=self.options.dry_run)
|
|
|
58 |
try:
|
|
|
59 |
ds.conn.disconnect()
|
|
|
60 |
ds._conn = None
|
|
|
61 |
except: # MIM doesn't do this
|
|
|
62 |
pass
|
| 59 |
|
63 |
|
| 60 |
def _setup_logging(self):
|
64 |
def _setup_logging(self):
|
| 61 |
if self.options.logging_config_file: # pragma no cover
|
65 |
if self.options.logging_config_file: # pragma no cover
|
| 62 |
logging.config.fileConfig(self.options.logging_config_file)
|
66 |
logging.config.fileConfig(self.options.logging_config_file)
|
| 63 |
else:
|
67 |
else:
|