From 749b5bfdd84c2f371e0847655af12049f9a3426d Mon Sep 17 00:00:00 2001 From: Erik Erlandson <eerlands@redhat.com> Date: Thu, 28 Oct 2021 14:50:15 -0700 Subject: [PATCH] export properly, fix extra paren --- osc_ingest_trino/__init__.py | 4 ++++ osc_ingest_trino/sqlcols.py | 7 ++++++- osc_ingest_trino/sqltypes.py | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/osc_ingest_trino/__init__.py b/osc_ingest_trino/__init__.py index 667a7d8..c7ff8ef 100644 --- a/osc_ingest_trino/__init__.py +++ b/osc_ingest_trino/__init__.py @@ -7,9 +7,13 @@ # defines the release version for this python package __version__ = "0.1.0" +from .sqlcols import * +from .sqltypes import * + __all__ = [ "sql_compliant_name", "enforce_sql_column_names", "pandas_type_to_sql", "create_table_schema_pairs", ] + diff --git a/osc_ingest_trino/sqlcols.py b/osc_ingest_trino/sqlcols.py index 9efe111..aa5283d 100644 --- a/osc_ingest_trino/sqlcols.py +++ b/osc_ingest_trino/sqlcols.py @@ -1,6 +1,11 @@ import re import pandas as pd +__all__ = [ + "sql_compliant_name", + "enforce_sql_column_names", +] + _wsdedup = re.compile(r"\s+") _usdedup = re.compile(r"__+") _rmpunc = re.compile(r"[,.()&$/+-]+") @@ -36,6 +41,6 @@ def enforce_sql_column_names(df, inplace=False, maxlen=63): ocols = sql_compliant_name(icols, maxlen=maxlen) if (len(set(ocols)) < len(ocols)): raise ValueError("remapped column names were not unique!") - rename_map = dict(list(zip(icols, ocols)))) + rename_map = dict(list(zip(icols, ocols))) return df.rename(columns=rename_map, inplace=inplace) diff --git a/osc_ingest_trino/sqltypes.py b/osc_ingest_trino/sqltypes.py index 5ed4bbb..1ace390 100644 --- a/osc_ingest_trino/sqltypes.py +++ b/osc_ingest_trino/sqltypes.py @@ -1,5 +1,10 @@ import pandas as pd +__all__ = [ + "pandas_type_to_sql", + "create_table_schema_pairs", +] + _p2smap = { 'string': 'varchar', 'float32': 'real',