From 803d1202f65b900dca4e2b0df1b2d0b04f897501 Mon Sep 17 00:00:00 2001 From: Andrew Kesterson Date: Sat, 19 Oct 2013 23:08:23 -0400 Subject: [PATCH] Added downgrade to initial DB script --- .../58f6a99bd6ec_create_fda_product_t.py | 11 ++++- .../58f6a99bd6ec_create_fda_product_t.py~ | 22 --------- puppet/mercy/manifests/#init.pp# | 31 ------------ puppet/mercy/manifests/params.pp~ | 23 --------- puppet/mercy/templates/apache/vhost.erb~ | 12 ----- .../mercy/templates/python/alembic.ini.erb~ | 49 ------------------- 6 files changed, 10 insertions(+), 138 deletions(-) delete mode 100644 alembic/versions/58f6a99bd6ec_create_fda_product_t.py~ delete mode 100644 puppet/mercy/manifests/#init.pp# delete mode 100644 puppet/mercy/manifests/params.pp~ delete mode 100644 puppet/mercy/templates/apache/vhost.erb~ delete mode 100644 puppet/mercy/templates/python/alembic.ini.erb~ diff --git a/alembic/versions/58f6a99bd6ec_create_fda_product_t.py b/alembic/versions/58f6a99bd6ec_create_fda_product_t.py index eafc2e8..aadf941 100644 --- a/alembic/versions/58f6a99bd6ec_create_fda_product_t.py +++ b/alembic/versions/58f6a99bd6ec_create_fda_product_t.py @@ -88,4 +88,13 @@ def upgrade(): ) def downgrade(): - pass + op.drop_table("drugbank_synonyms") + op.drop_table("drugbank_genericnames") + op.drop_table("drugbank_manufacturers") + op.drop_table("drugbank_packagers") + op.drop_table("drugbank_drug_categories") + op.drop_table("drugbank_categories") + op.drop_table("drugbank_prices") + op.drop_table("drugbank_drugs") + op.drop_table("fda_product_substances") + op.drop_table("fda_products") diff --git a/alembic/versions/58f6a99bd6ec_create_fda_product_t.py~ b/alembic/versions/58f6a99bd6ec_create_fda_product_t.py~ deleted file mode 100644 index 161b8c3..0000000 --- a/alembic/versions/58f6a99bd6ec_create_fda_product_t.py~ +++ /dev/null @@ -1,22 +0,0 @@ -"""create fda_product table - -Revision ID: 58f6a99bd6ec -Revises: None -Create Date: 2013-10-19 21:21:03.977000 - -""" - -# revision identifiers, used by Alembic. -revision = '58f6a99bd6ec' -down_revision = None - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - pass - - -def downgrade(): - pass diff --git a/puppet/mercy/manifests/#init.pp# b/puppet/mercy/manifests/#init.pp# deleted file mode 100644 index 28a67ba..0000000 --- a/puppet/mercy/manifests/#init.pp# +++ /dev/null @@ -1,31 +0,0 @@ -class mercy( - $environment, - $version, - $ensure, - $rabbitmq_uri, - $process_user => 'mercy', - $process_group => 'mercy', - $process_threads => 5, - $servername => $::fqdn, - $rabbitmq_user => 'mercy', - $rabbitmq_pw => 'mercy', - $rabbitmq_vhost => 'mercy', - $vhost_dir => '/etc/apache/httpd/conf.d', - $apache_service => 'httpd', - $port => 443, - $postgres_uri => 'localhost', - $postgres_user => 'mercy', - $postgres_pw => 'mercy', - $postgres_db => 'mercy') -{ - if ! defined(User[$process_user]) { - user { $process_user: - ensure => 'present' - } - } - if ! defined(Group[$process_group]) { - user { $process_group: - ensure => 'present' - } - } -} diff --git a/puppet/mercy/manifests/params.pp~ b/puppet/mercy/manifests/params.pp~ deleted file mode 100644 index 3f9e754..0000000 --- a/puppet/mercy/manifests/params.pp~ +++ /dev/null @@ -1,23 +0,0 @@ -class mercy::params ( $environment, - $version, - $ensure, - $rabbitmq_uri, - # ---- Everything below is optional - $process_user => 'mercy', - $process_group => 'mercy', - $process_threads => 5, - $servername => $::fqdn, - $rabbitmq_user => 'mercy', - $rabbitmq_pw => 'mercy', - $rabbitmq_vhost => 'mercy', - $vhost_dir => '/etc/apache/httpd/conf.d', - $apache_service => 'httpd', - $port => 443, - $postgres_uri => 'localhost', - $postgres_user => 'mercy', - $postgres_pw => 'mercy', - $postgres_db => 'mercy' - ) -{ - -} diff --git a/puppet/mercy/templates/apache/vhost.erb~ b/puppet/mercy/templates/apache/vhost.erb~ deleted file mode 100644 index ad3bc5f..0000000 --- a/puppet/mercy/templates/apache/vhost.erb~ +++ /dev/null @@ -1,12 +0,0 @@ -> - ServerName <%= scope.lookupvar('::fqdn') %> - WSGIDaemonProcess mercy user=<%= scope.lookupvar('::mercy::params::process_user') %> group=<%= scope.lookupvar('::mercy::params::process_group') %> threads=<%= scope.lookupvar('::mercy::params::process_threads') %> - WSGIScriptAlias / /opt/mercy/scripts/mercy.wsgi - - - WSGIProcessGroup mercy - WSGIApplicationGroup %{GLOBAL} - Order deny, allow - Allow from all - - \ No newline at end of file diff --git a/puppet/mercy/templates/python/alembic.ini.erb~ b/puppet/mercy/templates/python/alembic.ini.erb~ deleted file mode 100644 index 88a9e8a..0000000 --- a/puppet/mercy/templates/python/alembic.ini.erb~ +++ /dev/null @@ -1,49 +0,0 @@ -# A generic, single database configuration. - -[alembic] -# path to migration scripts -script_location = alembic - -# template used to generate migration files -# file_template = %%(rev)s_%%(slug)s - -# set to 'true' to run the environment during -# the 'revision' command, regardless of autogenerate -# revision_environment = false - -sqlalchemy.url = driver://mercy:mercy@postgresql.aklabs.net/mercy - -# Logging configuration -[loggers] -keys = root,sqlalchemy,alembic - -[handlers] -keys = console - -[formatters] -keys = generic - -[logger_root] -level = WARN -handlers = console -qualname = - -[logger_sqlalchemy] -level = WARN -handlers = -qualname = sqlalchemy.engine - -[logger_alembic] -level = INFO -handlers = -qualname = alembic - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = NOTSET -formatter = generic - -[formatter_generic] -format = %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %H:%M:%S