Closes frol#51: problem install with PostgreSQL database

Add PostgreSQL parameters to config (comment them by default) Update the existed migrations to make them work with PostgreSQL.
khorolets · Mar 7, 2017 · 19a7b4a · 19a7b4a
1 parent 8e08e70
commit 19a7b4a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/config.py b/config.py
@@ -7,6 +7,21 @@ class BaseConfig(object):
 
     PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__))
 
+    # POSTGRESQL
+    # DB_USER = 'user'
+    # DB_PASSWORD = 'password'
+    # DB_NAME = 'restplusdb'
+    # DB_HOST = 'localhost'
+    # DB_PORT = 5432
+    # SQLALCHEMY_DATABASE_URI = 'postgresql://{user}:{password}@{host}:{port}/{name}'.format(
+    #     user=DB_USER,
+    #     password=DB_PASSWORD,
+    #     host=DB_HOST,
+    #     post=DB_PORT,
+    #     name=DB_NAME,
+    # )
+
+    # SQLITE
     SQLALCHEMY_DATABASE_URI = 'sqlite:///%s' % (os.path.join(PROJECT_ROOT, "example.db"))
 
     DEBUG = False

diff --git a/migrations/versions/36954739c63_.py b/migrations/versions/36954739c63_.py
@@ -25,7 +25,8 @@ def upgrade():
         batch_op.alter_column('password',
                existing_type=sa.VARCHAR(length=128),
                type_=sqlalchemy_utils.types.password.PasswordType(max_length=128),
-               existing_nullable=False)
+               existing_nullable=False,
+               postgresql_using='password::bytea')
     ### end Alembic commands ###
 
     user = sa.Table('user',

diff --git a/migrations/versions/5e2954a2af18_refactored-auth-oauth2.py b/migrations/versions/5e2954a2af18_refactored-auth-oauth2.py
@@ -44,11 +44,14 @@
 def upgrade():
     connection = op.get_bind()
 
+    clienttypes = sa.dialects.postgresql.ENUM('public', 'confidential', name='clienttypes')
+    clienttypes.create(connection)
+
     with op.batch_alter_table('oauth2_client') as batch_op:
         batch_op.add_column(
             sa.Column(
                 'client_type',
-                sa.Enum('public', 'confidential'),
+                sa.Enum('public', 'confidential', name='clienttypes'),
                 server_default='public',
                 nullable=False
             )
@@ -168,6 +171,9 @@ def downgrade():
             OAuth2Client.update().values(_redirect_uris=OAuth2Client.c.redirect_uris)
         )
 
+    clienttypes = sa.dialects.postgresql.ENUM('public', 'confidential', name='clienttypes')
+    clienttypes.drop(connection)
+
     with op.batch_alter_table('oauth2_client') as batch_op:
         batch_op.drop_column('redirect_uris')
         batch_op.drop_column('default_scopes')

diff --git a/migrations/versions/82184d7d1e88_altered-OAuth2Token-token_type-to-Enum.py b/migrations/versions/82184d7d1e88_altered-OAuth2Token-token_type-to-Enum.py
@@ -15,16 +15,28 @@
 
 
 def upgrade():
+    connection = op.get_bind()
+
+
     with op.batch_alter_table('oauth2_token') as batch_op:
+        tokentypes = sa.dialects.postgresql.ENUM('Bearer', name='tokentypes')
+        tokentypes.create(connection)
+
         batch_op.alter_column('token_type',
                existing_type=sa.VARCHAR(length=40),
                type_=sa.Enum('Bearer', name='tokentypes'),
-               existing_nullable=False)
+               existing_nullable=False,
+               postgresql_using='token_type::tokentypes')
 
 
 def downgrade():
+    connection = op.get_bind()
+
     with op.batch_alter_table('oauth2_token') as batch_op:
         batch_op.alter_column('token_type',
                existing_type=sa.Enum('Bearer', name='tokentypes'),
                type_=sa.VARCHAR(length=40),
                existing_nullable=False)
+
+    tokentypes = sa.dialects.postgresql.ENUM('Bearer', name='tokentypes')
+    tokentypes.drop(connection)