feat: PostgreSQL compatibility

backend/alembic/versions/0009_models_refactor.py

@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.exc import OperationalError
+from utils.database import CustomJSON
 
 # revision identifiers, used by Alembic.
 revision = "0009_models_refactor"
@@ -84,13 +85,13 @@ def upgrade() -> None:
         )
         batch_op.alter_column(
             "url_screenshots",
-            existing_type=sa.JSON(),
+            existing_type=CustomJSON(),
             nullable=True,
             existing_server_default=sa.text("(JSON_ARRAY())"),
         )
         batch_op.alter_column(
             "path_screenshots",
-            existing_type=sa.JSON(),
+            existing_type=CustomJSON(),
             nullable=True,
             existing_server_default=sa.text("(JSON_ARRAY())"),
         )
@@ -133,13 +134,13 @@ def downgrade() -> None:
 
         batch_op.alter_column(
             "path_screenshots",
-            existing_type=sa.JSON(),
+            existing_type=CustomJSON(),
             nullable=False,
             existing_server_default=sa.text("(JSON_ARRAY())"),
         )
         batch_op.alter_column(
             "url_screenshots",
-            existing_type=sa.JSON(),
+            existing_type=CustomJSON(),
             nullable=False,
             existing_server_default=sa.text("(JSON_ARRAY())"),
         )

backend/alembic/versions/0012_add_regions_languages.py

@@ -8,6 +8,7 @@
 
 import sqlalchemy as sa
 from alembic import op
+from utils.database import CustomJSON, is_postgresql
 
 # revision identifiers, used by Alembic.
 revision = "0012_add_regions_languages"
@@ -19,8 +20,8 @@
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table("roms", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("regions", sa.JSON(), nullable=True))
-        batch_op.add_column(sa.Column("languages", sa.JSON(), nullable=True))
+        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
@@ -38,7 +39,7 @@ def downgrade() -> None:
         batch_op.add_column(sa.Column("region", sa.VARCHAR(length=20), nullable=True))
 
     with op.batch_alter_table("roms", schema=None) as batch_op:
-        if connection.engine.name == "postgresql":
+        if is_postgresql(connection):
             batch_op.execute("UPDATE roms SET region = regions->>0")
         else:
             batch_op.execute("UPDATE roms SET region = JSON_EXTRACT(regions, '$[0]')")

backend/alembic/versions/0014_asset_files.py

@@ -14,6 +14,7 @@
 from config.config_manager import SQLITE_DB_BASE_PATH, ConfigManager
 from sqlalchemy import create_engine, text
 from sqlalchemy.orm import sessionmaker
+from utils.database import CustomJSON, is_postgresql
 
 # revision identifiers, used by Alembic.
 revision = "0014_asset_files"
@@ -164,7 +165,7 @@ def upgrade() -> None:
         batch_op.drop_column("n_roms")
 
     # Switch to new id column as platform primary key
-    if connection.engine.name == "postgresql":
+    if is_postgresql(connection):
         op.execute("ALTER TABLE platforms ADD COLUMN id SERIAL PRIMARY KEY")
     else:
         op.execute(
@@ -179,7 +180,7 @@ def upgrade() -> None:
         batch_op.add_column(
             sa.Column("file_size_bytes", sa.BigInteger(), nullable=False)
         )
-        batch_op.add_column(sa.Column("igdb_metadata", sa.JSON(), nullable=True))
+        batch_op.add_column(sa.Column("igdb_metadata", CustomJSON(), nullable=True))
         batch_op.add_column(sa.Column("platform_id", sa.Integer(), nullable=False))
         batch_op.alter_column(
             "revision",
@@ -197,7 +198,7 @@ def upgrade() -> None:
         batch_op.execute(
             "update roms set file_name_no_ext = regexp_replace(file_name, '\\.[a-z]{2,}$', '')"
         )
-        if connection.engine.name == "postgresql":
+        if is_postgresql(connection):
             batch_op.execute(
                 """
                 UPDATE roms
@@ -264,7 +265,7 @@ def downgrade() -> None:
         batch_op.drop_constraint("fk_platform_id_roms", type_="foreignkey")
 
     with op.batch_alter_table("roms", schema=None) as batch_op:
-        if connection.engine.name == "postgresql":
+        if is_postgresql(connection):
             batch_op.execute(
                 """
                 UPDATE roms

backend/alembic/versions/0015_mobygames_data.py

@@ -8,6 +8,7 @@
 
 import sqlalchemy as sa
 from alembic import op
+from utils.database import CustomJSON
 
 # revision identifiers, used by Alembic.
 revision = "0015_mobygames_data"
@@ -23,7 +24,7 @@ def upgrade() -> None:
 
     with op.batch_alter_table("roms", schema=None) as batch_op:
         batch_op.add_column(sa.Column("moby_id", sa.Integer(), nullable=True))
-        batch_op.add_column(sa.Column("moby_metadata", sa.JSON(), nullable=True))
+        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()")

backend/alembic/versions/0022_collections_.py

@@ -14,6 +14,7 @@
 from alembic import op
 from config import RESOURCES_BASE_PATH
 from sqlalchemy import inspect
+from utils.database import CustomJSON
 
 # revision identifiers, used by Alembic.
 revision = "0022_collections"
@@ -94,7 +95,7 @@ def upgrade() -> None:
             sa.Column("path_cover_l", sa.String(length=1000), nullable=True),
             sa.Column("path_cover_s", sa.String(length=1000), nullable=True),
             sa.Column("url_cover", sa.Text(), nullable=True),
-            sa.Column("roms", sa.JSON(), nullable=False),
+            sa.Column("roms", CustomJSON(), nullable=False),
             sa.Column("user_id", sa.Integer(), nullable=False),
             sa.Column("is_public", sa.Boolean(), nullable=False),
             sa.Column(

backend/alembic/versions/0023_make_columns_non_nullable.py

@@ -8,6 +8,7 @@
 
 import sqlalchemy as sa
 from alembic import op
+from utils.database import is_postgresql
 
 # revision identifiers, used by Alembic.
 revision = "0023_make_columns_non_nullable"
@@ -18,7 +19,7 @@
 
 def upgrade() -> None:
     connection = op.get_bind()
-    false_value = "FALSE" if connection.engine.name == "postgresql" else "0"
+    false_value = "FALSE" if is_postgresql(connection) else "0"
 
     with op.batch_alter_table("platforms", schema=None) as batch_op:
         batch_op.execute("UPDATE platforms SET name = '' WHERE name IS NULL")

backend/alembic/versions/0024_sibling_roms_db_view.py

@@ -8,6 +8,7 @@
 
 import sqlalchemy as sa
 from alembic import op
+from utils.database import is_postgresql
 
 # revision identifiers, used by Alembic.
 revision = "0024_sibling_roms_db_view"
@@ -23,7 +24,7 @@ def upgrade() -> None:
 
     connection = op.get_bind()
     null_safe_equal_operator = (
-        "IS NOT DISTINCT FROM" if connection.engine.name == "postgresql" else "<=>"
+        "IS NOT DISTINCT FROM" if is_postgresql(connection) else "<=>"
     )
 
     connection.execute(

backend/alembic/versions/0026_romuser_status_fields.py

@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects.postgresql import ENUM
+from utils.database import is_postgresql
 
 # revision identifiers, used by Alembic.
 revision = "0026_romuser_status_fields"
@@ -33,7 +34,7 @@ def upgrade() -> None:
             existing_nullable=True,
         )
 
-    if connection.engine.name == "postgresql":
+    if is_postgresql(connection):
         rom_user_status_enum = ENUM(
             "INCOMPLETE",
             "FINISHED",
@@ -80,7 +81,7 @@ def downgrade() -> None:
         batch_op.drop_column("backlogged")
         batch_op.drop_column("last_played")
 
-    if connection.engine.name == "postgresql":
+    if is_postgresql(connection):
         ENUM(name="romuserstatus").drop(connection, checkfirst=False)
 
     with op.batch_alter_table("collections", schema=None) as batch_op:

backend/alembic/versions/1.6.2_.py

@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.exc import OperationalError
+from utils.database import CustomJSON
 
 # revision identifiers, used by Alembic.
 revision = "1.6.2"
@@ -50,7 +51,7 @@ def upgrade() -> None:
             sa.Column("has_cover", sa.Boolean(), nullable=True),
             sa.Column("region", sa.String(length=20), nullable=True),
             sa.Column("revision", sa.String(length=20), nullable=True),
-            sa.Column("tags", sa.JSON(), nullable=True),
+            sa.Column("tags", CustomJSON(), nullable=True),
             sa.PrimaryKeyConstraint("p_slug", "file_name"),
         )
     except OperationalError:

backend/alembic/versions/1.6.3_.py

@@ -8,6 +8,7 @@
 
 import sqlalchemy as sa
 from alembic import op
+from utils.database import CustomJSON
 
 # revision identifiers, used by Alembic.
 revision = "1.6.3"
@@ -20,7 +21,7 @@ def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table("roms") as batch_op:
         batch_op.add_column(sa.Column("multi", sa.Boolean(), nullable=True))
-        batch_op.add_column(sa.Column("files", sa.JSON(), nullable=True))
+        batch_op.add_column(sa.Column("files", CustomJSON(), nullable=True))
     # ### end Alembic commands ###
 
 

backend/alembic/versions/1.8.1_.py

@@ -8,6 +8,7 @@
 
 import sqlalchemy as sa
 from alembic import op
+from utils.database import CustomJSON
 
 # revision identifiers, used by Alembic.
 revision = "1.8.1"
@@ -22,15 +23,15 @@ def upgrade() -> None:
         batch_op.add_column(
             sa.Column(
                 "url_screenshots",
-                sa.JSON(),
+                CustomJSON(),
                 nullable=False,
                 server_default=sa.text("(JSON_ARRAY())"),
             )
         )
         batch_op.add_column(
             sa.Column(
                 "path_screenshots",
-                sa.JSON(),
+                CustomJSON(),
                 nullable=False,
                 server_default=sa.text("(JSON_ARRAY())"),
             )

backend/alembic/versions/1.8.3_.py

@@ -7,6 +7,7 @@
 """
 
 from alembic import op
+from utils.database import is_postgresql
 
 # revision identifiers, used by Alembic.
 revision = "1.8.3"
@@ -27,7 +28,7 @@ def upgrade() -> None:
         batch_op.execute(
             "UPDATE roms SET path_cover_l = REPLACE(path_cover_l, '/romm/resources/', '')"
         )
-        if connection.engine.name == "postgresql":
+        if is_postgresql(connection):
             batch_op.execute(
                 "UPDATE roms SET path_screenshots = REPLACE(path_screenshots::text, '/romm/resources/', '')::jsonb"
             )

backend/alembic/versions/1.8_.py

@@ -8,6 +8,7 @@
 
 import sqlalchemy as sa
 from alembic import op
+from utils.database import CustomJSON
 
 # revision identifiers, used by Alembic.
 revision = "1.8"
@@ -78,9 +79,9 @@ def upgrade() -> None:
             sa.Column("has_cover", sa.Boolean(), nullable=True),
             sa.Column("region", sa.String(length=20), nullable=True),
             sa.Column("revision", sa.String(length=20), nullable=True),
-            sa.Column("tags", sa.JSON(), nullable=True),
+            sa.Column("tags", CustomJSON(), nullable=True),
             sa.Column("multi", sa.Boolean(), nullable=True),
-            sa.Column("files", sa.JSON(), nullable=True),
+            sa.Column("files", CustomJSON(), nullable=True),
             sa.Column("url_cover", sa.Text(), nullable=True),
             sa.PrimaryKeyConstraint("id"),
         )

backend/alembic/versions/2.0.0_.py

@@ -9,6 +9,7 @@
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects.postgresql import ENUM
+from utils.database import is_postgresql
 
 # revision identifiers, used by Alembic.
 revision = "2.0.0"
@@ -47,5 +48,5 @@ def downgrade() -> None:
 
     op.drop_table("users")
 
-    if connection.engine.name == "postgresql":
+    if is_postgresql(connection):
         ENUM(name="role").drop(connection, checkfirst=False)

backend/handler/database/roms_handler.py

@@ -6,6 +6,7 @@
 from models.rom import Rom, RomUser
 from sqlalchemy import and_, delete, func, or_, select, update
 from sqlalchemy.orm import Query, Session, selectinload
+from utils.database import json_array_contains_value
 
 from .base_handler import DBBaseHandler
 
@@ -187,7 +188,11 @@ def get_rom_collections(
         return (
             session.scalars(
                 select(Collection)
-                .filter(func.json_contains(Collection.roms, f"{rom.id}"))
+                .filter(
+                    json_array_contains_value(
+                        Collection.roms, str(rom.id), session=session
+                    )
+                )
                 .order_by(Collection.name.asc())
             )
             .unique()

backend/models/collection.py

@@ -4,8 +4,9 @@
 
 from models.base import BaseModel
 from models.user import User
-from sqlalchemy import JSON, ForeignKey, String, Text
+from sqlalchemy import ForeignKey, String, Text
 from sqlalchemy.orm import Mapped, mapped_column, relationship
+from utils.database import CustomJSON
 
 
 class Collection(BaseModel):
@@ -24,7 +25,7 @@ class Collection(BaseModel):
     )
 
     roms: Mapped[set[int]] = mapped_column(
-        JSON, default=[], doc="Rom id's that belong to this collection"
+        CustomJSON(), default=[], doc="Rom id's that belong to this collection"
     )
 
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id", ondelete="CASCADE"))