diff --git a/Cargo.lock b/Cargo.lock index d2aaf95..8484ccd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -380,14 +380,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "excel-rs-csv" -version = "0.5.0" +version = "0.5.1" dependencies = [ "csv", ] [[package]] name = "excel-rs-postgres" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "chrono", @@ -403,7 +403,7 @@ dependencies = [ [[package]] name = "excel-rs-xlsx" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "zip", @@ -982,7 +982,7 @@ dependencies = [ [[package]] name = "py-excel-rs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "excel-rs-csv", "excel-rs-postgres", diff --git a/Cargo.toml b/Cargo.toml index f55c4e7..b001bb5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["crates/*", "py-excel-rs"] resolver = "2" [workspace.package] -version = "0.5.0" +version = "0.5.1" authors = ["Carl Voller"] edition = "2021" homepage = "https://github.com/carlvoller/excel-rs" @@ -11,9 +11,9 @@ license = "MIT" repository = "https://github.com/carlvoller/excel-rs" [workspace.dependencies] -excel-rs-xlsx = { version = "0.5.0", path = "crates/excel-rs-xlsx", default-features = false } -excel-rs-csv = { version = "0.5.0", path = "crates/excel-rs-csv", default-features = false } -excel-rs-postgres = { version = "0.5.0", path = "crates/excel-rs-postgres", default-features = false } +excel-rs-xlsx = { version = "0.5.1", path = "crates/excel-rs-xlsx", default-features = false } +excel-rs-csv = { version = "0.5.1", path = "crates/excel-rs-csv", default-features = false } +excel-rs-postgres = { version = "0.5.1", path = "crates/excel-rs-postgres", default-features = false } [profile.release] opt-level = 3 diff --git a/py-excel-rs/py_excel_rs/postgres.py b/py-excel-rs/py_excel_rs/postgres.py index 2ba31eb..a9c087d 100644 --- a/py-excel-rs/py_excel_rs/postgres.py +++ b/py-excel-rs/py_excel_rs/postgres.py @@ -74,9 +74,12 @@ def execute(self): table_name = schema_name schema_name = "" - columns = [f"\"{x}\"" for x in client.get_columns(table_name, schema_name, self._excluded)] if self._selected == "*": - query = f"SELECT {', '.join(columns)} FROM {self._table_name}" + if self._excluded is not None: + columns = [f"\"{x}\"" for x in client.get_columns(table_name, schema_name, self._excluded)] + query = f"SELECT {', '.join(columns)} FROM {self._table_name}" + else: + query = f"SELECT * FROM {self._table_name}" else: parsed = [f"'{x}'" for x in self._selected] query = f"SELECT {', '.join(parsed)} FROM {self._table_name}" @@ -84,7 +87,6 @@ def execute(self): if self._order_by is not None and self._order_by_col is not None: query += f" ORDER BY \"{self._order_by_col}\" {self._order_by.value}" - xlsx = client.get_xlsx_from_query(query) client.close() return xlsx diff --git a/py-excel-rs/pyproject.toml b/py-excel-rs/pyproject.toml index a205e35..0d86683 100644 --- a/py-excel-rs/pyproject.toml +++ b/py-excel-rs/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "py-excel-rs" -version = "0.5.0" +version = "0.5.1" description = "Some performant utility functions to convert common data structures to XLSX" dependencies = ["pandas", "numpy"] requires-python = ">=3.7"