SqlAlchemy 2

Author: lbesson

alembic_migration/env.py

@@ -52,8 +52,7 @@ def run_migrations_online():
     connectable = engine_from_config(
         config.get_section(config.config_ini_section),
         prefix='sqlalchemy.',
-        poolclass=pool.NullPool,
-        future=True)
+        poolclass=pool.NullPool)
 
     with connectable.connect() as connection:
         context.configure(

alembic_migration/versions/06d2a35e39c8_improve_serac_database.py

@@ -7,7 +7,7 @@
 """
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.sql.schema import Table, MetaData
+from sqlalchemy import Table, MetaData
 from alembic_migration.extensions import drop_enum
 import csv
 from c2corg_api.models.utils import ArrayOfEnum

alembic_migration/versions/24f8da659c78_add_ratings_to_outings.py

@@ -9,7 +9,7 @@
 import codecs
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.sql import text
+from sqlalchemy import text
 
 
 # revision identifiers, used by Alembic.

alembic_migration/versions/38df9393c9a9_init.py

@@ -14,7 +14,7 @@
 from alembic_migration.extensions import drop_enum
 import geoalchemy2
 from sqlalchemy.dialects import postgresql
-from sqlalchemy.sql.sqltypes import Enum
+from sqlalchemy import Enum
 
 # revision identifiers, used by Alembic.
 revision = '38df9393c9a9'
@@ -446,7 +446,7 @@
 # https://github.com/discourse/discourse/blob/master/app/models/username_validator.rb
 function_check_forum_username = extensions.ReplaceableObject(
     'users.check_forum_username(name TEXT)',
-    """
+    r"""
 RETURNS boolean AS $$
 BEGIN
   IF name = NULL THEN

alembic_migration/versions/8e0f02982746_update_avalanche_slopes.py

@@ -8,7 +8,7 @@
 from alembic import op
 import sqlalchemy as sa
 from alembic_migration.extensions import drop_enum
-from sqlalchemy.sql.schema import Table, MetaData
+from sqlalchemy import Table, MetaData
 
 
 # revision identifiers, used by Alembic.

alembic_migration/versions/bacd59c5806a_add_slacklining.py

@@ -9,7 +9,7 @@
 import sqlalchemy as sa
 from c2corg_api.models import utils
 from alembic_migration.extensions import drop_enum
-from sqlalchemy.sql.sqltypes import Enum
+from sqlalchemy import Enum
 
 # revision identifiers, used by Alembic.
 revision = 'bacd59c5806a'

alembic_migration/versions/d4d360ef69bc_update_public_transportation_types.py

@@ -9,9 +9,7 @@
 import sqlalchemy as sa
 
 from alembic_migration.extensions import drop_enum
-from sqlalchemy.sql.expression import and_, any_, cast
-from sqlalchemy.sql.functions import func
-from sqlalchemy.sql.schema import Table, MetaData
+from sqlalchemy import and_, any_, cast, func, Table, MetaData
 
 from c2corg_api.models.utils import ArrayOfEnum
 

c2corg_api/__init__.py

@@ -29,7 +29,7 @@ def main(global_config, **settings):
     """This function returns a Pyramid WSGI application."""
 
     # Configure SQLAlchemy
-    engine = engine_from_config(settings, "sqlalchemy.", future=True)
+    engine = engine_from_config(settings, "sqlalchemy.")
     DBSession.configure(bind=engine)
 
     # Configure ElasticSearch

c2corg_api/ext/sqa_view.py

@@ -1,4 +1,4 @@
-from sqlalchemy.sql.schema import Table, Column, MetaData
+from sqlalchemy import Table, Column, MetaData
 
 # Support for views in SQLAlchemy
 # See: https://bitbucket.org/zzzeek/sqlalchemy/wiki/UsageRecipes/Views

c2corg_api/jobs/purge_non_activated_accounts.py

@@ -3,7 +3,7 @@
 from c2corg_api.models.document_history import DocumentVersion, HistoryMetaData
 from c2corg_api.models.user_profile import UserProfile
 from datetime import datetime
-from sqlalchemy.sql.expression import and_
+from sqlalchemy import and_
 from sqlalchemy.orm import sessionmaker
 
 import logging