Merge branch 'master' into emualtorjs-save-refactor

rommapp · Jan 19, 2025 · 1c27208 · 1c27208
2 parents bf4d5da + 19c4c61
commit 1c27208
Show file tree

Hide file tree

Showing 10 changed files with 406 additions and 31 deletions.
diff --git a/backend/alembic/versions/0009_models_refactor.py b/backend/alembic/versions/0009_models_refactor.py
@@ -9,7 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.exc import OperationalError
-from utils.database import CustomJSON
+from utils.database import CustomJSON, is_postgresql
 
 # revision identifiers, used by Alembic.
 revision = "0009_models_refactor"
@@ -21,6 +21,10 @@
 def upgrade() -> None:
     connection = op.get_bind()
 
+    json_array_build_func = (
+        "jsonb_build_array()" if is_postgresql(connection) else "JSON_ARRAY()"
+    )
+
     try:
         with op.batch_alter_table("platforms", schema=None) as batch_op:
             batch_op.alter_column(
@@ -87,13 +91,13 @@ def upgrade() -> None:
             "url_screenshots",
             existing_type=CustomJSON(),
             nullable=True,
-            existing_server_default=sa.text("(JSON_ARRAY())"),
+            existing_server_default=sa.text(f"({json_array_build_func})"),
         )
         batch_op.alter_column(
             "path_screenshots",
             existing_type=CustomJSON(),
             nullable=True,
-            existing_server_default=sa.text("(JSON_ARRAY())"),
+            existing_server_default=sa.text(f"({json_array_build_func})"),
         )
 
     try:
@@ -108,6 +112,10 @@ def upgrade() -> None:
 def downgrade() -> None:
     connection = op.get_bind()
 
+    json_array_build_func = (
+        "jsonb_build_array()" if is_postgresql(connection) else "JSON_ARRAY()"
+    )
+
     with op.batch_alter_table("roms", schema=None) as batch_op:
         batch_op.alter_column(
             "igdb_id",
@@ -136,13 +144,13 @@ def downgrade() -> None:
             "path_screenshots",
             existing_type=CustomJSON(),
             nullable=False,
-            existing_server_default=sa.text("(JSON_ARRAY())"),
+            existing_server_default=sa.text(f"({json_array_build_func})"),
         )
         batch_op.alter_column(
             "url_screenshots",
             existing_type=CustomJSON(),
             nullable=False,
-            existing_server_default=sa.text("(JSON_ARRAY())"),
+            existing_server_default=sa.text(f"({json_array_build_func})"),
         )
         batch_op.alter_column(
             "file_size_units", existing_type=sa.VARCHAR(length=10), nullable=True

diff --git a/backend/alembic/versions/0012_add_regions_languages.py b/backend/alembic/versions/0012_add_regions_languages.py
@@ -18,19 +18,22 @@
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    connection = op.get_bind()
+
     with op.batch_alter_table("roms", schema=None) as batch_op:
         batch_op.add_column(sa.Column("regions", CustomJSON(), nullable=True))
         batch_op.add_column(sa.Column("languages", CustomJSON(), nullable=True))
 
     with op.batch_alter_table("roms", schema=None) as batch_op:
         # Set default values for languages and regions
-        batch_op.execute("UPDATE roms SET languages = JSON_ARRAY()")
-        batch_op.execute("UPDATE roms SET regions = JSON_ARRAY(region)")
+        if is_postgresql(connection):
+            batch_op.execute("UPDATE roms SET languages = jsonb_build_array()")
+            batch_op.execute("UPDATE roms SET regions = jsonb_build_array(region)")
+        else:
+            batch_op.execute("UPDATE roms SET languages = JSON_ARRAY()")
+            batch_op.execute("UPDATE roms SET regions = JSON_ARRAY(region)")
         batch_op.drop_column("region")
 
-    # ### end Alembic commands ###
-
 
 def downgrade() -> None:
     connection = op.get_bind()

diff --git a/backend/alembic/versions/0014_asset_files.py b/backend/alembic/versions/0014_asset_files.py
@@ -191,7 +191,10 @@ def upgrade() -> None:
 
     # Move data around
     with op.batch_alter_table("roms", schema=None) as batch_op:
-        batch_op.execute("update roms set igdb_metadata = JSON_OBJECT()")
+        if is_postgresql(connection):
+            batch_op.execute("update roms set igdb_metadata = jsonb_build_object()")
+        else:
+            batch_op.execute("update roms set igdb_metadata = JSON_OBJECT()")
         batch_op.execute(
             "update roms set path_cover_s = '', path_cover_l = '', url_cover = '' where url_cover = 'https://images.igdb.com/igdb/image/upload/t_cover_big/nocover.png'"
         )

diff --git a/backend/alembic/versions/0015_mobygames_data.py b/backend/alembic/versions/0015_mobygames_data.py
@@ -8,7 +8,7 @@
 
 import sqlalchemy as sa
 from alembic import op
-from utils.database import CustomJSON
+from utils.database import CustomJSON, is_postgresql
 
 # revision identifiers, used by Alembic.
 revision = "0015_mobygames_data"
@@ -18,7 +18,8 @@
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    connection = op.get_bind()
+
     with op.batch_alter_table("platforms", schema=None) as batch_op:
         batch_op.add_column(sa.Column("moby_id", sa.Integer(), nullable=True))
 
@@ -27,9 +28,10 @@ def upgrade() -> None:
         batch_op.add_column(sa.Column("moby_metadata", CustomJSON(), nullable=True))
 
     with op.batch_alter_table("roms", schema=None) as batch_op:
-        batch_op.execute("update roms set moby_metadata = JSON_OBJECT()")
-
-    # ### end Alembic commands ###
+        if is_postgresql(connection):
+            batch_op.execute("update roms set moby_metadata = jsonb_build_object()")
+        else:
+            batch_op.execute("update roms set moby_metadata = JSON_OBJECT()")
 
 
 def downgrade() -> None: