From 6e20b41fd24e2f58550d3064e53f95a9421b562b Mon Sep 17 00:00:00 2001
From: Brandon Rodriguez <brodriguez8774@gmail.com>
Date: Mon, 10 Oct 2022 13:42:18 -0400
Subject: [PATCH] Clean up some query indentation formatting
---
py_dbcn/connectors/core/records.py | 57 ++++++++++++++----------
py_dbcn/connectors/core/tables.py | 11 +++--
py_dbcn/connectors/mysql/display.py | 6 ++-
py_dbcn/connectors/postgresql/display.py | 6 ++-
4 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/py_dbcn/connectors/core/records.py b/py_dbcn/connectors/core/records.py
index 5a9d79d..7d23fe0 100644
--- a/py_dbcn/connectors/core/records.py
+++ b/py_dbcn/connectors/core/records.py
@@ -7,6 +7,7 @@ Should be inherited by language-specific connectors.
# System Imports.
import datetime
+import textwrap
# Internal Imports.
from py_dbcn.logging import init_logging
@@ -117,10 +118,12 @@ class BaseRecords:
values_clause = updated_values_clause
# Insert record.
- query = """
- INSERT INTO {0}{1}
- VALUES {2};
- """.format(table_name, columns_clause, values_clause)
+ query = textwrap.dedent(
+ """
+ INSERT INTO {0}{1}
+ VALUES {2};
+ """.format(table_name, columns_clause, values_clause)
+ )
results = self._base.query.execute(query, display_query=display_query)
if display_results:
self._base.display.results('{0}'.format(results))
@@ -168,10 +171,12 @@ class BaseRecords:
values_context = ', '.join('%s' for i in range(len(values_clause[0])))
# Insert record.
- query = """
- INSERT INTO {0}{1}
- VALUES ({2});
- """.format(table_name, columns_clause, values_context)
+ query = textwrap.dedent(
+ """
+ INSERT INTO {0}{1}
+ VALUES ({2});
+ """.format(table_name, columns_clause, values_context)
+ )
results = self._base.query.execute_many(query, values_clause, display_query=display_query)
if display_results:
self._base.display.results('{0}'.format(results))
@@ -217,10 +222,12 @@ class BaseRecords:
values_clause = updated_values_clause
# Update record.
- query = """
- UPDATE {0}
- SET {1}{2};
- """.format(table_name, values_clause, where_clause)
+ query = textwrap.dedent(
+ """
+ UPDATE {0}
+ SET {1}{2};
+ """.format(table_name, values_clause, where_clause)
+ )
self._base.query.execute(query, display_query=display_query)
# Do a select to get the updated values as results.
@@ -302,10 +309,10 @@ class BaseRecords:
' {0}'.format(x)
for x in values_clause
])
- columns_clause = ', '.join(
+ columns_clause = ', '.join([
x.strip(self._base.validate._quote_column_format)
for x in columns_clause
- )
+ ])
where_columns_clause = ',\n'.join([
' pydbcn_update_table.{0} = pydbcn_temp.{0}'.format(x.strip(self._base.validate._quote_column_format))
for x in where_columns_clause
@@ -319,16 +326,18 @@ class BaseRecords:
# print('\ncolumns_clause:\n{0}'.format(columns_clause))
# Update records.
- query = """
- UPDATE {0} AS pydbcn_update_table SET
- {1}
- FROM (VALUES
- {2}
- ) AS pydbcn_temp ({3})
- WHERE (
- {4}
- );
- """.format(table_name, set_clause, values_clause, columns_clause, where_columns_clause)
+ query = textwrap.dedent(
+ """
+ UPDATE {0} AS pydbcn_update_table SET
+ {1}
+ FROM (VALUES
+ {2}
+ ) AS pydbcn_temp ({3})
+ WHERE (
+ {4}
+ );
+ """.format(table_name, set_clause, values_clause, columns_clause, where_columns_clause)
+ )
results = self._base.query.execute(query, display_query=display_query)
diff --git a/py_dbcn/connectors/core/tables.py b/py_dbcn/connectors/core/tables.py
index 25da822..ca907df 100644
--- a/py_dbcn/connectors/core/tables.py
+++ b/py_dbcn/connectors/core/tables.py
@@ -6,6 +6,7 @@ Should be inherited by language-specific connectors.
"""
# System Imports.
+import textwrap
# Internal Imports.
from py_dbcn.logging import init_logging
@@ -154,10 +155,12 @@ class BaseTables:
raise ValueError('Invalid table columns of "{0}".'.format(column_clause))
# Modify table.
- query = """
- ALTER TABLE {0}
- {1} {2};
- """.format(table_name, modify_clause, column_clause)
+ query = textwrap.dedent(
+ """
+ ALTER TABLE {0}
+ {1} {2};
+ """.format(table_name, modify_clause, column_clause)
+ )
self._base.query.execute(query, display_query=display_query)
if display_results:
self._base.display.results('Created table "{0}".'.format(table_name))
diff --git a/py_dbcn/connectors/mysql/display.py b/py_dbcn/connectors/mysql/display.py
index b543d10..e425263 100644
--- a/py_dbcn/connectors/mysql/display.py
+++ b/py_dbcn/connectors/mysql/display.py
@@ -26,6 +26,8 @@ class MysqlDisplay(BaseDisplay):
logger.debug('Generating related (MySQL) Display class.')
- self.max_col_length_query = textwrap.dedent("""
+ self.max_col_length_query = textwrap.dedent(
+ """
SELECT MAX(LENGTH({2}{0}{2})) FROM {1};
- """.strip())
+ """.strip()
+ )
diff --git a/py_dbcn/connectors/postgresql/display.py b/py_dbcn/connectors/postgresql/display.py
index b5e2cfc..79f1dfc 100644
--- a/py_dbcn/connectors/postgresql/display.py
+++ b/py_dbcn/connectors/postgresql/display.py
@@ -26,6 +26,8 @@ class PostgresqlDisplay(BaseDisplay):
logger.debug('Generating related (PostgreSQL) Display class.')
- self.max_col_length_query = textwrap.dedent("""
+ self.max_col_length_query = textwrap.dedent(
+ """
SELECT MAX(LENGTH(CAST({2}{0}{2} as text))) FROM {1};
- """.strip())
+ """.strip()
+ )
--
GitLab