12 files changed, 24 insertions, 24 deletions
diff --git a/heat/db/sqlalchemy/alembic.ini b/heat/db/alembic.ini
index b4a2f235a..dbee79a3b 100644
--- a/heat/db/sqlalchemy/alembic.ini
+++ b/heat/db/alembic.ini
@@ -7,10 +7,10 @@ script_location = %(here)s/migrations
 prepend_sys_path = .
 
 # version location specification; This defaults
-# to heat/db/sqlalchemy/migrations/versions.  When using multiple version
+# to heat/db/migrations/versions.  When using multiple version
 # directories, initial revisions must be specified with --version-path.
 # The path separator used here should be the separator specified by "version_path_separator" below.
-# version_locations = %(here)s/bar:%(here)s/bat:heat/db/sqlalchemy/migrations/versions
+# version_locations = %(here)s/bar:%(here)s/bat:heat/db/migrations/versions
 
 # version path separator; As mentioned above, this is the character used to split
 # version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
diff --git a/heat/db/sqlalchemy/api.py b/heat/db/api.py
index 1556d2d76..8b2c99967 100644
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/api.py
@@ -38,9 +38,9 @@ from sqlalchemy.orm import aliased as orm_aliased
 from heat.common import crypt
 from heat.common import exception
 from heat.common.i18n import _
-from heat.db.sqlalchemy import filters as db_filters
-from heat.db.sqlalchemy import models
-from heat.db.sqlalchemy import utils as db_utils
+from heat.db import filters as db_filters
+from heat.db import models
+from heat.db import utils as db_utils
 from heat.engine import environment as heat_environment
 from heat.rpc import api as rpc_api
 
diff --git a/heat/db/sqlalchemy/filters.py b/heat/db/filters.py
index 6c7b8cf24..6c7b8cf24 100644
--- a/heat/db/sqlalchemy/filters.py
+++ b/heat/db/filters.py
diff --git a/heat/db/sqlalchemy/migration.py b/heat/db/migration.py
index 67ac4c3b4..910656ca1 100644
--- a/heat/db/sqlalchemy/migration.py
+++ b/heat/db/migration.py
@@ -18,7 +18,7 @@ from alembic import migration as alembic_migration
 from oslo_log import log as logging
 import sqlalchemy as sa
 
-from heat.db.sqlalchemy import api as db_api
+from heat.db import api as db_api
 
 LOG = logging.getLogger(__name__)
 
diff --git a/heat/db/sqlalchemy/migrations/README.rst b/heat/db/migrations/README.rst
index b2283fc82..b2283fc82 100644
--- a/heat/db/sqlalchemy/migrations/README.rst
+++ b/heat/db/migrations/README.rst
diff --git a/heat/db/sqlalchemy/migrations/env.py b/heat/db/migrations/env.py
index 84413f313..932b16a97 100644
--- a/heat/db/sqlalchemy/migrations/env.py
+++ b/heat/db/migrations/env.py
@@ -16,7 +16,7 @@ from alembic import context
 from sqlalchemy import engine_from_config
 from sqlalchemy import pool
 
-from heat.db.sqlalchemy import models
+from heat.db import models
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
diff --git a/heat/db/sqlalchemy/migrations/script.py.mako b/heat/db/migrations/script.py.mako
index 120937fbc..120937fbc 100644
--- a/heat/db/sqlalchemy/migrations/script.py.mako
+++ b/heat/db/migrations/script.py.mako
diff --git a/heat/db/sqlalchemy/migrations/versions/c6214ca60943_initial_revision.py b/heat/db/migrations/versions/c6214ca60943_initial_revision.py
index b6a4e7bbc..d3e9d757d 100644
--- a/heat/db/sqlalchemy/migrations/versions/c6214ca60943_initial_revision.py
+++ b/heat/db/migrations/versions/c6214ca60943_initial_revision.py
@@ -20,7 +20,7 @@ Create Date: 2023-03-22 18:04:02.387269
 from alembic import op
 import sqlalchemy as sa
 
-import heat.db.sqlalchemy.types
+import heat.db.types
 
 # revision identifiers, used by Alembic.
 revision = 'c6214ca60943'
@@ -33,7 +33,7 @@ def upgrade() -> None:
     op.create_table(
         'raw_template_files',
         sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('files', heat.db.sqlalchemy.types.Json(), nullable=True),
+        sa.Column('files', heat.db.types.Json(), nullable=True),
         sa.Column('created_at', sa.DateTime(), nullable=True),
         sa.Column('updated_at', sa.DateTime(), nullable=True),
         sa.PrimaryKeyConstraint('id'),
@@ -42,7 +42,7 @@ def upgrade() -> None:
     op.create_table(
         'resource_properties_data',
         sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('data', heat.db.sqlalchemy.types.Json(), nullable=True),
+        sa.Column('data', heat.db.types.Json(), nullable=True),
         sa.Column('encrypted', sa.Boolean(), nullable=True),
         sa.Column('created_at', sa.DateTime(), nullable=True),
         sa.Column('updated_at', sa.DateTime(), nullable=True),
@@ -71,7 +71,7 @@ def upgrade() -> None:
         sa.Column('updated_at', sa.DateTime(), nullable=True),
         sa.Column('name', sa.String(length=255), nullable=True),
         sa.Column('group', sa.String(length=255), nullable=True),
-        sa.Column('config', heat.db.sqlalchemy.types.Json(), nullable=True),
+        sa.Column('config', heat.db.types.Json(), nullable=True),
         sa.Column('tenant', sa.String(length=64), nullable=False),
         sa.PrimaryKeyConstraint('id'),
         mysql_engine='InnoDB',
@@ -104,10 +104,10 @@ def upgrade() -> None:
         sa.Column('id', sa.Integer(), nullable=False),
         sa.Column('created_at', sa.DateTime(), nullable=True),
         sa.Column('updated_at', sa.DateTime(), nullable=True),
-        sa.Column('template', heat.db.sqlalchemy.types.Json(), nullable=True),
-        sa.Column('files', heat.db.sqlalchemy.types.Json(), nullable=True),
+        sa.Column('template', heat.db.types.Json(), nullable=True),
+        sa.Column('files', heat.db.types.Json(), nullable=True),
         sa.Column(
-            'environment', heat.db.sqlalchemy.types.Json(), nullable=True
+            'environment', heat.db.types.Json(), nullable=True
         ),
         sa.Column('files_id', sa.Integer(), nullable=True),
         sa.ForeignKeyConstraint(
@@ -126,10 +126,10 @@ def upgrade() -> None:
         sa.Column('server_id', sa.String(length=36), nullable=False),
         sa.Column('config_id', sa.String(length=36), nullable=False),
         sa.Column(
-            'input_values', heat.db.sqlalchemy.types.Json(), nullable=True
+            'input_values', heat.db.types.Json(), nullable=True
         ),
         sa.Column(
-            'output_values', heat.db.sqlalchemy.types.Json(), nullable=True
+            'output_values', heat.db.types.Json(), nullable=True
         ),
         sa.Column('action', sa.String(length=255), nullable=True),
         sa.Column('status', sa.String(length=255), nullable=True),
@@ -188,7 +188,7 @@ def upgrade() -> None:
         sa.Column('convergence', sa.Boolean(), nullable=True),
         sa.Column('current_traversal', sa.String(length=36), nullable=True),
         sa.Column(
-            'current_deps', heat.db.sqlalchemy.types.Json(), nullable=True
+            'current_deps', heat.db.types.Json(), nullable=True
         ),
         sa.Column(
             'parent_resource_name', sa.String(length=255), nullable=True
@@ -261,15 +261,15 @@ def upgrade() -> None:
         sa.Column('status_reason', sa.Text(), nullable=True),
         sa.Column('stack_id', sa.String(length=36), nullable=False),
         sa.Column(
-            'rsrc_metadata', heat.db.sqlalchemy.types.Json(), nullable=True
+            'rsrc_metadata', heat.db.types.Json(), nullable=True
         ),
         sa.Column(
-            'properties_data', heat.db.sqlalchemy.types.Json(), nullable=True
+            'properties_data', heat.db.types.Json(), nullable=True
         ),
         sa.Column('engine_id', sa.String(length=36), nullable=True),
         sa.Column('atomic_key', sa.Integer(), nullable=True),
-        sa.Column('needed_by', heat.db.sqlalchemy.types.List(), nullable=True),
-        sa.Column('requires', heat.db.sqlalchemy.types.List(), nullable=True),
+        sa.Column('needed_by', heat.db.types.List(), nullable=True),
+        sa.Column('requires', heat.db.types.List(), nullable=True),
         sa.Column('replaces', sa.Integer(), nullable=True),
         sa.Column('replaced_by', sa.Integer(), nullable=True),
         sa.Column('current_template_id', sa.Integer(), nullable=True),
@@ -314,7 +314,7 @@ def upgrade() -> None:
         sa.Column('updated_at', sa.DateTime(), nullable=True),
         sa.Column('status', sa.String(length=255), nullable=True),
         sa.Column('status_reason', sa.String(length=255), nullable=True),
-        sa.Column('data', heat.db.sqlalchemy.types.Json(), nullable=True),
+        sa.Column('data', heat.db.types.Json(), nullable=True),
         sa.Column('tenant', sa.String(length=64), nullable=False),
         sa.ForeignKeyConstraint(
             ['stack_id'],
@@ -361,7 +361,7 @@ def upgrade() -> None:
         sa.Column('atomic_key', sa.Integer(), nullable=False),
         sa.Column('stack_id', sa.String(length=36), nullable=False),
         sa.Column(
-            'input_data', heat.db.sqlalchemy.types.Json(), nullable=True
+            'input_data', heat.db.types.Json(), nullable=True
         ),
         sa.Column('created_at', sa.DateTime(), nullable=True),
         sa.Column('updated_at', sa.DateTime(), nullable=True),
diff --git a/heat/db/sqlalchemy/models.py b/heat/db/models.py
index ca208bef0..ebc235f5d 100644
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/models.py
@@ -21,7 +21,7 @@ from sqlalchemy.ext import declarative
 from sqlalchemy.orm import backref
 from sqlalchemy.orm import relationship
 
-from heat.db.sqlalchemy import types
+from heat.db import types
 
 BASE = declarative.declarative_base()
 
diff --git a/heat/db/sqlalchemy/__init__.py b/heat/db/sqlalchemy/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/heat/db/sqlalchemy/__init__.py
+++ /dev/null
diff --git a/heat/db/sqlalchemy/types.py b/heat/db/types.py
index d454024c6..d454024c6 100644
--- a/heat/db/sqlalchemy/types.py
+++ b/heat/db/types.py
diff --git a/heat/db/sqlalchemy/utils.py b/heat/db/utils.py
index 67e2d541e..67e2d541e 100644
--- a/heat/db/sqlalchemy/utils.py
+++ b/heat/db/utils.py