db: Move 'schema' module up a level

We want to remove the old sqlalchemy-migrate based migrations. Move the
only remaining module we need from this up a level so we can 'rm -rf'
the entire directory in a future change.

Change-Id: I3b1a1668c48e3136fd91b1418e00c38deec76bb5
Implements: blueprint remove-sqlalchemy-migrate
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

glance/db/sqlalchemy/alembic_migrations/add_artifacts_tables.py

@@ -17,7 +17,7 @@ from alembic import op
 from sqlalchemy.schema import (
     Column, PrimaryKeyConstraint, ForeignKeyConstraint)
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, Integer, BigInteger, String, Text, Numeric)  # noqa
 
 

glance/db/sqlalchemy/alembic_migrations/add_images_tables.py

@@ -18,7 +18,7 @@ from sqlalchemy import sql
 from sqlalchemy.schema import (
     Column, PrimaryKeyConstraint, ForeignKeyConstraint, UniqueConstraint)
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, Integer, BigInteger, String, Text)  # noqa
 from glance.db.sqlalchemy.models import JSONEncodedDict
 

glance/db/sqlalchemy/alembic_migrations/add_metadefs_tables.py

@@ -17,7 +17,7 @@ from alembic import op
 from sqlalchemy.schema import (
     Column, PrimaryKeyConstraint, ForeignKeyConstraint, UniqueConstraint)
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, Integer, String, Text)  # noqa
 from glance.db.sqlalchemy.models import JSONEncodedDict
 

glance/db/sqlalchemy/alembic_migrations/add_tasks_tables.py

@@ -17,7 +17,7 @@ from alembic import op
 from sqlalchemy.schema import (
     Column, PrimaryKeyConstraint, ForeignKeyConstraint)
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, String, Text)  # noqa
 from glance.db.sqlalchemy.models import JSONEncodedDict
 

glance/db/sqlalchemy/migrate_repo/versions/001_add_images_table.py

@@ -15,7 +15,7 @@
 
 from sqlalchemy.schema import (Column, MetaData, Table)
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, Integer, String, Text, create_tables)  # noqa
 
 

glance/db/sqlalchemy/migrate_repo/versions/002_add_image_properties_table.py

@@ -16,7 +16,7 @@
 from sqlalchemy.schema import (
     Column, ForeignKey, Index, MetaData, Table, UniqueConstraint)
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, Integer, String, Text, create_tables,
     from_migration_import)  # noqa
 

glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py

@@ -15,7 +15,7 @@
 
 from sqlalchemy import Column, MetaData, Table, and_, select
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, Integer, String, Text, from_migration_import)  # noqa
 
 

glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py

@@ -15,7 +15,7 @@
 
 from sqlalchemy import Column, MetaData, Table
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, Integer, String, Text, from_migration_import)  # noqa
 
 

glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py

@@ -15,7 +15,7 @@
 
 from sqlalchemy import Column, MetaData, Table
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, BigInteger, Integer, String,
     Text, from_migration_import)  # noqa
 

glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py

@@ -15,7 +15,7 @@
 
 from sqlalchemy import Index, MetaData
 
-from glance.db.sqlalchemy.migrate_repo.schema import from_migration_import
+from glance.db.sqlalchemy.schema import from_migration_import
 
 
 def get_images_table(meta):

glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py

@@ -15,7 +15,7 @@
 
 from sqlalchemy import Column, MetaData, Table
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, BigInteger, Integer, String,
     Text)  # noqa
 

glance/db/sqlalchemy/migrate_repo/versions/008_add_image_members_table.py

@@ -16,7 +16,7 @@
 from sqlalchemy import Column, ForeignKey, Index, MetaData, Table
 from sqlalchemy import UniqueConstraint
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, Integer, String, create_tables,
     from_migration_import)  # noqa
 

glance/db/sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py

@@ -15,7 +15,7 @@
 
 from sqlalchemy import Column, MetaData, Table
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, Integer, String, Text)  # noqa
 
 

glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py

@@ -15,7 +15,7 @@
 
 from sqlalchemy import MetaData
 
-from glance.db.sqlalchemy.migrate_repo.schema import from_migration_import
+from glance.db.sqlalchemy.schema import from_migration_import
 
 
 def get_images_table(meta):

glance/db/sqlalchemy/migrate_repo/versions/014_add_image_tags_table.py

@@ -15,7 +15,7 @@
 
 from sqlalchemy import schema
 
-from glance.db.sqlalchemy.migrate_repo import schema as glance_schema
+from glance.db.sqlalchemy import schema as glance_schema
 
 
 def define_image_tags_table(meta):

glance/db/sqlalchemy/migrate_repo/versions/018_add_image_locations_table.py

@@ -15,7 +15,7 @@
 
 import sqlalchemy
 
-from glance.db.sqlalchemy.migrate_repo import schema
+from glance.db.sqlalchemy import schema
 
 
 def upgrade(migrate_engine):

glance/db/sqlalchemy/migrate_repo/versions/026_add_location_storage_information.py

@@ -15,7 +15,7 @@
 
 import sqlalchemy
 
-from glance.db.sqlalchemy.migrate_repo import schema
+from glance.db.sqlalchemy import schema
 
 
 def upgrade(migrate_engine):

glance/db/sqlalchemy/migrate_repo/versions/030_add_tasks_table.py

@@ -16,7 +16,7 @@
 
 from sqlalchemy.schema import (Column, MetaData, Table, Index)
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, String, Text, create_tables)  # noqa
 
 

glance/db/sqlalchemy/migrate_repo/versions/032_add_task_info_table.py

@@ -15,9 +15,8 @@
 
 from sqlalchemy.schema import (Column, ForeignKey, MetaData, Table)
 
-from glance.db.sqlalchemy.migrate_repo.schema import (String,
-                                                      Text,
-                                                      create_tables)  # noqa
+from glance.db.sqlalchemy.schema import (
+    String, Text, create_tables)  # noqa
 
 TASKS_MIGRATE_COLUMNS = ['input', 'message', 'result']
 

glance/db/sqlalchemy/migrate_repo/versions/033_add_location_status.py

@@ -15,7 +15,7 @@
 import six
 import sqlalchemy
 
-from glance.db.sqlalchemy.migrate_repo import schema
+from glance.db.sqlalchemy import schema
 
 
 def upgrade(migrate_engine):

glance/db/sqlalchemy/migrate_repo/versions/035_add_metadef_tables.py

@@ -17,7 +17,7 @@ from sqlalchemy.schema import (
     Column, ForeignKey, Index, MetaData, Table, UniqueConstraint)  # noqa
 
 from glance.common import timeutils
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     Boolean, DateTime, Integer, String, Text, create_tables)  # noqa
 
 

glance/db/sqlalchemy/migrate_repo/versions/038_add_metadef_tags_table.py

@@ -15,7 +15,7 @@
 from sqlalchemy.schema import (
     Column, Index, MetaData, Table, UniqueConstraint)  # noqa
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     DateTime, Integer, String, create_tables)  # noqa
 
 

glance/db/sqlalchemy/migrate_repo/versions/041_add_artifact_tables.py

@@ -15,7 +15,7 @@
 from sqlalchemy.schema import (Column, ForeignKey, Index, MetaData, Table)
 
 
-from glance.db.sqlalchemy.migrate_repo.schema import (
+from glance.db.sqlalchemy.schema import (
     BigInteger, Boolean, DateTime, Integer, Numeric, String, Text,
     create_tables)  # noqa