Skip to content

Fix 54 #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 22, 2023
Merged

Fix 54 #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d5170c7
function that adds quotes to schema name if the schema name contains …
JanCaha Mar 17, 2023
257ee60
needs string with " if upper case letters, psycopg2 takes care of add…
JanCaha Mar 17, 2023
2fc6076
add workspace
JanCaha Mar 17, 2023
009eae9
parametrize tests, so that they run on two project names - adding pro…
JanCaha Mar 17, 2023
9b415db
add test info about workspace
JanCaha Mar 17, 2023
bacdf83
update test name
JanCaha Mar 22, 2023
0e17527
fix tests to properly escape schema names
JanCaha Mar 22, 2023
dca2b59
add to avoid accidental commits
JanCaha Mar 22, 2023
c74ea2d
escape if schema contains other characters then a-z 0-9 and _, use do…
JanCaha Mar 22, 2023
904a88e
rename tests to avoid potential issues on Windows
JanCaha Mar 22, 2023
7287c69
do not parameterize all the tests
JanCaha Mar 22, 2023
b864614
create simple parametrized test, that contains just init, push and pu…
JanCaha Mar 22, 2023
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ config.ini
mergin
.coverage
htmlcov
.vscode
.env
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ To run automatic tests:
export TEST_MERGIN_URL=<url> # testing server
export TEST_API_USERNAME=<username>
export TEST_API_PASSWORD=<pwd>
export TEST_API_WORKSPACE=<workspace>
pytest-3 test/


Expand Down
10 changes: 10 additions & 0 deletions dbsync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import tempfile
import random
import uuid
import re

import psycopg2
from itertools import chain
Expand All @@ -34,6 +35,14 @@ class DbSyncError(Exception):
pass


def _add_quotes_to_schema_name(schema: str) -> str:
matches = re.findall(r"[^a-z0-9_]", schema)
if len(matches) != 0:
schema = schema.replace("\"", "\"\"")
schema = f'"{schema}"'
return schema


def _tables_list_to_string(tables):
return ";".join(tables)

Expand Down Expand Up @@ -230,6 +239,7 @@ def _set_db_project_comment(conn, schema, project_name, version, project_id=None
def _get_db_project_comment(conn, schema):
""" Get Mergin Maps project name and its current version in db schema"""
cur = conn.cursor()
schema = _add_quotes_to_schema_name(schema)
cur.execute("SELECT obj_description(%s::regnamespace, 'pg_namespace')", (schema, ))
res = cur.fetchone()[0]
try:
Expand Down
Loading