diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fc4e25..f9e6afe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,7 @@ jobs: pytest: name: Run Python unit tests - # Note that 20.04 is currently required until galvani supports mdbtools>=1.0. - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false diff --git a/galvani/res2sqlite.py b/galvani/res2sqlite.py index 2329473..591b945 100755 --- a/galvani/res2sqlite.py +++ b/galvani/res2sqlite.py @@ -439,7 +439,8 @@ def mdb_get_data_text(s3db, filename, table): print("Reading %s..." % table) insert_pattern = re.compile( - r'INSERT INTO "\w+" \([^)]+?\) VALUES \(("[^"]*"|[^")])+?\);\n', re.IGNORECASE + r"""INSERT INTO "\w+" \([^)]+?\) VALUES (\((('[^']*')|"[^"]*"|[^')])+?\),?\s*)+;\n""", + re.IGNORECASE, ) try: # Initialize values to avoid NameError in except clause