switch to postgres

.travis.yml

@@ -4,7 +4,9 @@ python:
 install:
   - "pip install coveralls coverage --use-wheel"
   - "pip install -r requirements.pip --use-wheel"
+before_script:
+  - psql -c 'create database mamasbm_test;' -U postgres
 script:
-  - coverage run --source=mamasbm mamasbm/setup.py test
+  - MAMASBM_TEST_CONNECTION_STRING='postgresql://postgres@localhost:5432/mamasbm_test' coverage run --source=mamasbm mamasbm/setup.py test
 after_success:
   - coveralls

mamasbm/development.ini

@@ -3,6 +3,10 @@
 # http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
 ###
 
+[alembic]
+script_location = migrations
+pyramid_config_file = %(here)s/development.ini
+
 [app:main]
 use = egg:mamasbm
 
@@ -15,7 +19,7 @@ pyramid.includes =
     pyramid_debugtoolbar
     pyramid_tm
 
-sqlalchemy.url = sqlite:///%(here)s/mamasbm.db
+sqlalchemy.url = postgresql://postgres@localhost:5432/mamasbm
 
 # By default, the toolbar only appears for clients from IP addresses
 # '127.0.0.1' and '::1'.

mamasbm/mamasbm/web/tests.py

@@ -1,11 +1,11 @@
 import os
 import transaction
-from StringIO import StringIO
 
-from mamasbm import main
 from pyramid import testing
 from unittest import TestCase
 from webtest import TestApp
+
+from mamasbm import main
 from mamasbm.models import DBSession, Base, Profile
 from mamasbm.web.csv_handler import CsvImporter
 from mamasbm.web import factory
@@ -14,12 +14,15 @@
 class TestProfilesView(TestCase):
     def setUp(self):
         self.config = testing.setUp()
-        self.app = TestApp(main({}, **{'sqlalchemy.url': 'sqlite://'}))
+        connection_string = os.environ.get(
+            "MAMASBM_TEST_CONNECTION_STRING", "sqlite://")
+        self.app = TestApp(main({}, **{'sqlalchemy.url': connection_string}))
         Base.metadata.create_all()
 
     def tearDown(self):
         DBSession.remove()
         testing.tearDown()
+        Base.metadata.drop_all()
 
     def test_get_profiles_empty(self):
         resp = self.app.get('/web/api/profiles.json', status=200)

mamasbm/migrations/env.py

@@ -23,6 +23,7 @@
 # my_important_option = config.get_main_option("my_important_option")
 # ... etc.
 
+
 def run_migrations_offline():
     """Run migrations in 'offline' mode.
 
@@ -41,6 +42,7 @@ def run_migrations_offline():
     with context.begin_transaction():
         context.run_migrations()
 
+
 def run_migrations_online():
     """Run migrations in 'online' mode.
 
@@ -49,15 +51,15 @@ def run_migrations_online():
 
     """
     engine = engine_from_config(
-                config.get_section(config.config_ini_section),
-                prefix='sqlalchemy.',
-                poolclass=pool.NullPool)
+        config.get_section('app:main'),
+        prefix='sqlalchemy.',
+        poolclass=pool.NullPool)
 
     connection = engine.connect()
     context.configure(
-                connection=connection,
-                target_metadata=target_metadata
-                )
+        connection=connection,
+        target_metadata=target_metadata
+    )
 
     try:
         with context.begin_transaction():
@@ -69,4 +71,3 @@ def run_migrations_online():
     run_migrations_offline()
 else:
     run_migrations_online()
-

mamasbm/migrations/versions/18b7e31bc9ed_add_message_models.py

@@ -28,7 +28,7 @@ def upgrade():
         'message_profiles',
         sa.Column('uuid', UUID(), nullable=False),
         sa.Column('name', sa.Text(), nullable=True),
-        sa.Column('profile_id', sa.Integer(), nullable=True),
+        sa.Column('profile_id', UUID(), nullable=True),
         sa.ForeignKeyConstraint(['profile_id'], ['profiles.uuid'], ),
         sa.PrimaryKeyConstraint('uuid')
     )

mamasbm/migrations/versions/1c89d076746b_add_message_profile_join_field.py

@@ -12,11 +12,13 @@
 
 from alembic import op
 import sqlalchemy as sa
+from mamasbm.models import UUID
 
 
 def upgrade():
     ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('messages', sa.Column('message_profile_id', sa.Integer(), nullable=True))
+    op.add_column(
+        'messages', sa.Column('message_profile_id', UUID(), nullable=True))
     ### end Alembic commands ###
 
 

mamasbm/production.ini

@@ -3,6 +3,10 @@
 # http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
 ###
 
+[alembic]
+script_location = migrations
+pyramid_config_file = %(here)s/production.ini
+
 [app:main]
 use = egg:mamasbm
 
@@ -14,7 +18,7 @@ pyramid.default_locale_name = en
 pyramid.includes =
     pyramid_tm
 
-sqlalchemy.url = sqlite:///%(here)s/mamasbm.db
+sqlalchemy.url = postgresql://postgres@localhost:5432/mamasbm
 
 [server:main]
 use = egg:waitress#main

requirements.pip

@@ -10,4 +10,5 @@ waitress
 alembic
 webtest
 cornice
+psycopg2
 -e mamasbm