Skip to content

Fix table names with space #23

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix table names with space #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 34 additions & 13 deletions pandas_access/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
except ImportError:
from io import BytesIO

#TABLE_RE = re.compile("CREATE TABLE \[(\w+)\]\s+\((.*?\));",re.MULTILINE | re.DOTALL)
TABLE_RE = re.compile(r"CREATE TABLE \[(.+?)\]\s+\((.*?);", re.MULTILINE | re.DOTALL)

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_RE = re.compile(r"\s*\[(.+?)\]\s*(.*?)(,|\))")


def list_tables(rdb_file, encoding="latin-1"):
Expand All @@ -22,22 +22,40 @@ 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 = subprocess.check_output(['mdb-tables','-d', ',', rdb_file]).decode(encoding)
return tables.strip().split(",")


def _extract_dtype(data_type):
# Note, this list is surely incomplete. But, I only had one .mdb file
# at the time of creation. If you see a new data-type, patch-pull or just
# open an issue.
data_type = data_type.lower()
if data_type.startswith('double'):
return np.float_
elif data_type.startswith('long'):
return np.int_
else:
return None


# if data_type.startswith('double'):
# return np.float_
# elif data_type.startswith('long'):
# return np.int_
# else:
# return None

match data_type:
case _ if data_type.startswith('double'):
return np.float_
# case _ if data_type.startswith('long'):
# return np.int_
# case _ if data_type.startswith('text'):
# return np.str_
# # case _ if data_type.startswith('datetime'):
# # return np.datetime64
# case _ if data_type.startswith('currency'):
# return np.float_
# case _ if data_type.startswith('byte'):
# return np.int8
case _ if data_type.startswith('boolean'):
return np.bool_
case _:
return None

def _extract_defs(defs_str):
defs = {}
Expand Down Expand Up @@ -113,6 +131,9 @@ def read_table(rdb_file, table_name, *args, **kwargs):
`chunksize=k`)
"""
if kwargs.pop('converters_from_schema', True):
# if ' ' in table_name:
# table_name = f"'{table_name}'"

specified_dtypes = kwargs.pop('dtype', {})
schema_encoding = kwargs.pop('schema_encoding', 'utf8')
schemas = to_pandas_schema(read_schema(rdb_file, schema_encoding),
Expand Down