Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repos:

# Remove unused imports/variables
- repo: https://github.com/PyCQA/autoflake
rev: v2.3.1
rev: v2.3.3
hooks:
- id: autoflake
args:
Expand All @@ -25,14 +25,14 @@ repos:

# Sort imports
- repo: https://github.com/pycqa/isort
rev: "7.0.0"
rev: "8.0.1"
hooks:
- id: isort
args: ["--profile", "black"]

# Black formatting
- repo: https://github.com/psf/black-pre-commit-mirror
rev: "25.12.0"
rev: "26.3.1"
hooks:
- id: black
args: ["--line-length=99"]
Expand Down
8 changes: 2 additions & 6 deletions pirogue/information_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ def columns(
WHERE attrelid = '{s}.{t}'::regclass
AND attisdropped IS NOT TRUE
AND attnum > 0
ORDER BY attnum ASC""".format(
s=table_schema, t=table_name
)
ORDER BY attnum ASC""".format(s=table_schema, t=table_name)
else:
sql = """
SELECT c.column_name
Expand All @@ -85,9 +83,7 @@ def columns(
WHERE table_type = 'VIEW'
AND t.table_schema = '{s}'
AND t.table_name = '{t}'
ORDER BY ordinal_position""".format(
s=table_schema, t=table_name
)
ORDER BY ordinal_position""".format(s=table_schema, t=table_name)
with connection.cursor() as pg_cur:
pg_cur.execute(sql)
pg_fields = pg_cur.fetchall()
Expand Down
4 changes: 2 additions & 2 deletions pirogue/multiple_inheritance.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def __init__(
if key not in ("declare", "pre", "post"):
raise InvalidDefinition(f"key {key} is not valid in trigger definitions")

(self.master_schema, self.master_table) = table_parts(definition.get("table", None))
self.master_schema, self.master_table = table_parts(definition.get("table", None))
self.master_skip_colums = definition.get("skip_columns", [])
self.master_prefix = definition.get("prefix", None)
self.master_remap_columns = definition.get("remap_columns", {})
Expand Down Expand Up @@ -128,7 +128,7 @@ def __init__(
self.joins = definition["joins"]
self.joined_ref_master_key = []
for alias, table_def in self.joins.items():
(table_def["table_schema"], table_def["table_name"]) = table_parts(table_def["table"])
table_def["table_schema"], table_def["table_name"] = table_parts(table_def["table"])
table_def["short_alias"] = table_def.get("short_alias", alias)

if "fkey" in table_def:
Expand Down
6 changes: 3 additions & 3 deletions pirogue/simple_joins.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def __init__(self, definition: dict, connection: psycopg.Connection):

self.conn = connection

(self.parent_schema, self.parent_table) = table_parts(definition["table"])
self.parent_schema, self.parent_table = table_parts(definition["table"])
self.view_schema = definition.get("view_schema", self.parent_schema)
self.view_name = definition.get("view_name", f"vw_{self.parent_table}")

Expand All @@ -64,10 +64,10 @@ def __init__(self):
self.child_tables = {}
for alias, table_def in definition["joins"].items():
child = Table()
(child.schema_name, child.table_name) = table_parts(table_def["table"])
child.schema_name, child.table_name = table_parts(table_def["table"])
child.pkey = primary_key(self.conn, child.schema_name, child.table_name)
try:
(child.parent_referenced_key, child.ref_parent_key) = reference_columns(
child.parent_referenced_key, child.ref_parent_key = reference_columns(
self.conn,
self.parent_schema,
self.parent_table,
Expand Down
6 changes: 3 additions & 3 deletions pirogue/single_inheritance.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ def __init__(
self.pkey_default_value = pkey_default_value
self.inner_defaults = inner_defaults

(self.parent_schema, self.parent_table) = table_parts(parent_table)
(self.child_schema, self.child_table) = table_parts(child_table)
self.parent_schema, self.parent_table = table_parts(parent_table)
self.child_schema, self.child_table = table_parts(child_table)

if view_schema is None:
if self.parent_schema != self.child_schema:
Expand All @@ -64,7 +64,7 @@ def __init__(
pt=self.parent_table, ct=self.child_table
)

(self.ref_parent_key, parent_referenced_key) = reference_columns(
self.ref_parent_key, parent_referenced_key = reference_columns(
self.conn,
self.child_schema,
self.child_table,
Expand Down