diff --git a/py_dbcn/connectors/core/records.py b/py_dbcn/connectors/core/records.py index 5a9d79d3edba0b3613d46ed95eeda8ec001a2799..7d23fe051699d84ac288a3fb03447d5eb3671aa5 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 25da822d1d9ce08ad35529a710697f2cf0d82f46..ca907dfc64e4214aaa2128113e65ea17fb20034f 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 b543d1010f9c52fbb7e805c5590683da0a8160cf..e425263415a81486683b145360ff3f1a77b682ca 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 b5e2cfcdef96c3fce244a28241ca836062377ab5..79f1dfcb74967a69a7af60ca965d377a0cdf1e44 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() + )