chris/galvani
1
0
Fork 0
mirror of https://github.com/echemdata/galvani.git synced 2025-12-14 01:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99 from chatcannon/mdbtools-1-0

Browse Source 
Update regular expression for mdbtools 1.0 output
This commit is contained in:
Chris Kerr
2024-02-03 13:47:06 +02:00
committed by GitHub
parent 0267b8b59f dbd01957db
commit aa0aee6128
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@@ -17,8 +17,7 @@ jobs:
pytest: pytest:
name: Run Python unit tests name: Run Python unit tests
# Note that 20.04 is currently required until galvani supports mdbtools>=1.0. runs-on: ubuntu-22.04
runs-on: ubuntu-20.04
strategy: strategy:
fail-fast: false fail-fast: false

3
galvani/res2sqlite.py
View File

@@ -439,7 +439,8 @@ CREATE VIEW IF NOT EXISTS Capacity_View
def mdb_get_data_text(s3db, filename, table): def mdb_get_data_text(s3db, filename, table):
print("Reading %s..." % table) print("Reading %s..." % table)
insert_pattern = re.compile( insert_pattern = re.compile(
r'INSERT INTO "\w+" \([^)]+?\) VALUES \(("[^"]*"|[^")])+?\);\n', re.IGNORECASE r"""INSERT INTO "\w+" \([^)]+?\) VALUES (\((('[^']*')|"[^"]*"|[^')])+?\),?\s*)+;\n""",
re.IGNORECASE,
) )
try: try:
# Initialize values to avoid NameError in except clause # Initialize values to avoid NameError in except clause