Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion development.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Watching the type definitions is also useful to pick up any changes to imports o

## Running locally in a docker composition

If you want to run the whole stack locally, you can use the docker. Docker will build the images from yout local files and run the services.
If you want to run the whole stack locally, you can use the docker. Docker will build the images from your local files and run the services.

```shell
# Run the docker composition with the current Dockerfiles
Expand Down
1 change: 1 addition & 0 deletions server/mergin/auth/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,7 @@ paths:
description: User info
content:
application/json:
# TODO: fix this to match the ma.SQLAlchemy schema or use UserDetail schema
schema:
$ref: "#/components/schemas/UserInfo"
"401":
Expand Down
2 changes: 1 addition & 1 deletion server/mergin/sync/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ class SyncFailuresHistory(db.Model):
error_type = db.Column(
db.String, index=True
) # e.g. push_start, push_finish, push_lost
error_details = db.Column(db.String, index=True)
error_details = db.Column(db.String)
timestamp = db.Column(db.DateTime(), default=datetime.utcnow, index=True)
user_id = db.Column(
db.Integer, db.ForeignKey("user.id", ondelete="SET NULL"), nullable=True
Expand Down
4 changes: 2 additions & 2 deletions server/migrations/community/2686074eff45_ce_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial

""" Base migration for CE, reflects the state of release 2021.6.1
"""Base migration for CE, reflects the state of release 2021.6.1

Revision ID: 2686074eff45
Revises:
Revises:
Create Date: 2022-12-15 10:40:42.234210

"""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
"""Drop error details index

Revision ID: 5ad13be6f7ef
Revises: ba5051218de4
Create Date: 2025-02-20 07:52:36.670158

"""

from alembic import op
import sqlalchemy as sa
from alembic import context


# revision identifiers, used by Alembic.
revision = "5ad13be6f7ef"
down_revision = "ba5051218de4"
branch_labels = None
depends_on = None


def upgrade():
conn = op.get_bind()
conn.execute(
sa.text(
"""
DROP INDEX IF EXISTS ix_sync_failures_history_error_details;
"""
)
)


def downgrade():
op.create_index(
op.f("ix_sync_failures_history_error_details"),
"sync_failures_history",
["error_details"],
unique=False,
)
Loading