From 9bfcd51cfdba379d924fdbc000303f2936dfab24 Mon Sep 17 00:00:00 2001 From: cabriona Date: Thu, 12 Dec 2019 15:25:43 +0200 Subject: [PATCH 1/2] more correct parcing columns for schema Old code cant find field [reg] in current test data for _extract_defs(defs_str) defs_str = ''' [fam] Text (100), [nam] Text (100), [fnm] Text (100), [dat] DateTime, [rod] Text (510), [gor] Text (510), [kod] Long Integer, [reg] Text (300) ) ''' --- pandas_access/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas_access/__init__.py b/pandas_access/__init__.py index 9fffccb..88e2868 100644 --- a/pandas_access/__init__.py +++ b/pandas_access/__init__.py @@ -11,7 +11,7 @@ TABLE_RE = re.compile("CREATE TABLE \[(\w+)\]\s+\((.*?\));", re.MULTILINE | re.DOTALL) -DEF_RE = re.compile("\s*\[(\w+)\]\s*(.*?),") +DEF_RE = re.compile("\s*\[(\w+)\]\s*([^,]*),?") def list_tables(rdb_file, encoding="latin-1"): From c0ab5dfb54c5cbb5dd2c214901a590fe7e38d430 Mon Sep 17 00:00:00 2001 From: cabriona Date: Mon, 16 Dec 2019 12:44:53 +0200 Subject: [PATCH 2/2] Update __init__.py --- pandas_access/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas_access/__init__.py b/pandas_access/__init__.py index 88e2868..6b1dfe5 100644 --- a/pandas_access/__init__.py +++ b/pandas_access/__init__.py @@ -8,7 +8,7 @@ from io import BytesIO -TABLE_RE = re.compile("CREATE TABLE \[(\w+)\]\s+\((.*?\));", +TABLE_RE = re.compile("CREATE TABLE \[([^\]]+)\]\s*\(([^\;]*)\)\;", re.MULTILINE | re.DOTALL) DEF_RE = re.compile("\s*\[(\w+)\]\s*([^,]*),?")