Skip to content

Can read table names and columns if they have spaces #7

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

Open
douglasbastos wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Can read table names and columns if they have spaces #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ee6bfe
Update regex to read tables and columns with spaces
douglasbastos Jul 24, 2019
044b877
Fix list_tables to return all tables correctly
douglasbastos Jul 24, 2019
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
20 changes: 11 additions & 9 deletions pandas_access/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
from io import BytesIO


TABLE_RE = re.compile("CREATE TABLE \[(\w+)\]\s+\((.*?\));",
TABLE_RE = re.compile("CREATE TABLE \[([a-zA-Z_0-9 ]+)\]\s+\((.*?\));",
re.MULTILINE | re.DOTALL)

DEF_RE = re.compile("\s*\[(\w+)\]\s*(.*?),")
DEF_RE = re.compile("\s*\[([a-zA-Z_0-9 ]+)\]\s*(.*?),")


def list_tables(rdb_file, encoding="latin-1"):
Expand All @@ -22,8 +22,8 @@ def list_tables(rdb_file, encoding="latin-1"):
actually be UTF-8.
:return: A list of the tables in a given database.
"""
tables = subprocess.check_output(['mdb-tables', rdb_file]).decode(encoding)
return tables.strip().split(" ")
tables = get_tables(rdb_file, encoding)
return [table for table, _ in tables]


def _extract_dtype(data_type):
Expand All @@ -48,6 +48,11 @@ def _extract_defs(defs_str):
defs[m.group(1)] = m.group(2)
return defs

def get_tables(rdb_file, encoding='utf8'):
output = subprocess.check_output(['mdb-schema', rdb_file])
lines = output.decode(encoding).splitlines()
schema_ddl = "\n".join(l for l in lines if l and not l.startswith('-'))
return TABLE_RE.findall(schema_ddl)

def read_schema(rdb_file, encoding='utf8'):
"""
Expand All @@ -56,12 +61,9 @@ def read_schema(rdb_file, encoding='utf8'):
spits out UTF-8, exclusively.
:return: a dictionary of table -> column -> access_data_type
"""
output = subprocess.check_output(['mdb-schema', rdb_file])
lines = output.decode(encoding).splitlines()
schema_ddl = "\n".join(l for l in lines if l and not l.startswith('-'))

tables = get_tables(rdb_file, encoding)
schema = {}
for table, defs in TABLE_RE.findall(schema_ddl):
for table, defs in tables:
schema[table] = _extract_defs(defs)

return schema
Expand Down