Version 0.6.3.

Fixed problems with postgresql query for table & view columns.

Author: DavidJLambert

DBClient.py

@@ -157,7 +157,7 @@ def database_table_schema(self, colsep='|') -> None:
         if skip_operation(sql_x):
             if sql_x == mq.not_implemented:
                 z = mq.not_implemented
-                print(z.format("TABLES", self.db_type.upper()))
+                print('\n' + z.format("TABLES", self.db_type.upper()))
             elif sql_x == mq.not_possible_sql:
                 z = mq.not_possible_sql
                 print(z.format(self.db_type.upper(), self.db_lib_name.upper()))
@@ -209,12 +209,13 @@ def database_table_schema(self, colsep='|') -> None:
         if skip_operation(sql_x):
             if sql_x == mq.not_implemented:
                 z = mq.not_implemented
-                print(z.format("TABLE'S COLUMNS", self.db_type.upper()))
+                print('\n' + z.format("TABLE'S COLUMNS", self.db_type.upper()))
             elif sql_x == mq.not_possible_sql:
                 z = mq.not_possible_sql
                 print(z.format(self.db_type.upper(), self.db_lib_name.upper()))
         else:
             columns_col_names, columns_rows = self._find_table_columns(my_table)
+            print('\nHere are the columns for table {}:'.format(my_table))
             writer1.write_rows(columns_rows, columns_col_names)
             print()
 
@@ -223,7 +224,7 @@ def database_table_schema(self, colsep='|') -> None:
         if skip_operation(sql_x):
             if sql_x == mq.not_implemented:
                 z = mq.not_implemented
-                print(z.format("INDEXES", self.db_type.upper()))
+                print('\n' + z.format("INDEXES", self.db_type.upper()))
             elif sql_x == mq.not_possible_sql:
                 z = mq.not_possible_sql
                 print(z.format(self.db_type.upper(), self.db_lib_name.upper()))
@@ -238,7 +239,7 @@ def database_table_schema(self, colsep='|') -> None:
         if skip_operation(sql_x):
             if sql_x == mq.not_implemented:
                 z = mq.not_implemented
-                print(z.format("INDEX'S COLUMNS", self.db_type.upper()))
+                print('\n' + z.format("INDEX'S COLUMNS", self.db_type.upper()))
             elif sql_x == mq.not_possible_sql:
                 z = mq.not_possible_sql
                 print(z.format(self.db_type.upper(), self.db_lib_name.upper()))
@@ -249,20 +250,18 @@ def database_table_schema(self, colsep='|') -> None:
             # Concatenate names of columns in index.  In function-based indexes,
             # use user_ind_expressions.column_expression instead of
             # user_ind_columns.column_name.
-            index_columns = ''
+            index_columns = list()
             for column_pos, column_name, descend, column_expr in ind_col_rows:
-                if index_columns != '':
-                    index_columns += ', '
                 if column_expr is None or column_expr == '':
-                    index_columns += column_name + ' ' + descend
+                    index_columns.append(column_name + ' ' + descend)
                 else:
-                    index_columns += column_expr + ' ' + descend
-            index_columns = '(' + index_columns + ')'
+                    index_columns.append(column_expr + ' ' + descend)
+            index_columns = '(' + ', '.join(index_columns) + ')'
             # Add index_columns to end of each index/row (index is a tuple!).
             indexes_rows[count] = index_row + (index_columns,)
 
         # Print output.
-        print()
+        print('\nHere are the indexes on table {}:'.format(my_table))
         writer1.write_rows(indexes_rows, indexes_col_names)
         writer1.close_output_file()
         return
@@ -281,7 +280,7 @@ def database_view_schema(self, colsep='|') -> None:
         if skip_operation(sql_x):
             if sql_x == mq.not_implemented:
                 z = mq.not_implemented
-                print(z.format("VIEWS", self.db_type.upper()))
+                print('\n' + z.format("VIEWS", self.db_type.upper()))
             elif sql_x == mq.not_possible_sql:
                 z = mq.not_possible_sql
                 print(z.format(self.db_type.upper(), self.db_lib_name.upper()))
@@ -334,7 +333,8 @@ def database_view_schema(self, colsep='|') -> None:
         my_view_sql = my_view[columns['view_sql']]
 
         # Print the sql for this view.
-        print('\nHere is the SQL for this view:\n"{}"'.format(my_view_sql))
+        z = '\nHere is the SQL for view {}:\n"{}"'
+        print(z.format(my_view_name, my_view_sql))
 
         # Set up to write output.
         writer1 = OutputWriter(out_file_name='', align_col=True, col_sep=colsep)
@@ -349,6 +349,7 @@ def database_view_schema(self, colsep='|') -> None:
                 z = mq.not_possible_sql
                 print(z.format(self.db_type.upper(), self.db_lib_name.upper()))
             return
+        print('\nHere are the columns for view {}:'.format(my_view_name))
         columns_col_names, columns_rows = self._find_view_columns(my_view_name)
 
         writer1.write_rows(columns_rows, columns_col_names)

MyFunctions.py

@@ -157,7 +157,7 @@ def sql_cmdline(os: str, sql: str, db_type: str, db_path: str, username: str,
 
     if not file_in_path(os, db_client_exe):
         print('Did not find {} in PATH.'.format(db_client_exe))
-        return
+        return list()
 
     cmd = ''
     if db_type == access:

MyQueries.py

@@ -58,7 +58,7 @@
     "  'No' AS is_deletable,\n"
     "  is_trigger_insertable_into, is_trigger_updatable, is_trigger_deletable\n"
     "FROM information_schema.views\n"
-    "WHERE table_schema ='public'\n"
+    "WHERE table_schema = 'public'\n"
     "ORDER BY table_name;")
 find_views_sql[sqlite] = (
     "SELECT name AS view_name, sql AS view_sql,\n"
@@ -68,7 +68,8 @@
     "WHERE type='view'\n"
     "ORDER BY name")
 find_views_sql[sqlserver] = (
-    "SELECT name AS view_name, object_definition(object_id(name)) AS view_sql,\n"
+    "SELECT name AS view_name, object_definition(object_id(name)) AS "
+    "  view_sql,\n"
     "  'No' AS check_option, 'No' AS is_updatable, 'No' AS is_insertable,\n"
     "  'No' AS is_deletable\n"
     "FROM sys.views WHERE type='V'\n"
@@ -78,7 +79,13 @@
 
 find_tab_col_sql = dict()
 find_tab_col_sql[access] = not_possible_sql
-find_tab_col_sql[mysql] = not_implemented
+find_tab_col_sql[mysql] = (
+    "SELECT ordinal_position AS column_id, column_name,\n"
+    "  column_type AS data_type, is_nullable as nullable,\n"
+    "  column_default AS default_value, column_comment AS comments\n"
+    "FROM INFORMATION_SCHEMA.COLUMNS\n"
+    "WHERE table_name = '{}'\n"
+    "AND table_schema = database()")
 find_tab_col_sql[oracle] = (
     "SELECT column_id, c.column_name,\n"
     "  CASE\n"
@@ -110,7 +117,37 @@
     "AND c.table_name = com.table_name\n"
     "AND c.column_name = com.column_name\n"
     "ORDER BY column_id")
-find_tab_col_sql[postgresql] = not_implemented
+find_tab_col_sql[postgresql] = (
+    "SELECT ordinal_position AS column_id, column_name,\n"
+    "  CASE \n"
+    "    WHEN data_type = 'character varying'\n"
+    "      THEN 'varchar('||character_maximum_length||')'\n"
+    "    WHEN data_type = 'bit'\n"
+    "      THEN 'bit('||character_maximum_length||')'\n"
+    "    WHEN data_type = 'bit varying'\n"
+    "      THEN 'varbit('||character_maximum_length||')'\n"
+    "    WHEN data_type = 'character'\n"
+    "      THEN 'char('||character_maximum_length||')'\n"
+    "    WHEN data_type='numeric' AND numeric_precision IS NOT NULL AND "
+    "          numeric_scale IS NOT NULL\n"
+    "      THEN 'numeric('||numeric_precision||','||numeric_scale||')'\n"
+    "    WHEN data_type IN ('bigint', 'boolean', 'date', 'double precision',"
+    "          'integer', 'money', 'numeric', 'real', 'smallint', 'text')\n"
+    "      THEN data_type\n"
+    "    WHEN data_type LIKE 'timestamp%' AND datetime_precision != 6\n"
+    "      THEN REPLACE(data_type, 'timestamp', "
+    "          'timestamp('||datetime_precision||')')\n"
+    "    WHEN data_type LIKE 'time%' AND datetime_precision != 6\n"
+    "      THEN REGEXP_REPLACE(data_type, '^time',"
+    "          'time('||datetime_precision||')')\n"
+    "    ELSE data_type\n"
+    "    END AS data_type,\n"
+    "  is_nullable AS nullable,\n"
+    "  column_default AS default_value,\n"
+    "  '' AS comments\n"
+    "FROM INFORMATION_SCHEMA.COLUMNS\n"
+    "WHERE table_name = '{}'\n"
+    "AND table_schema = 'public'")
 find_tab_col_sql[sqlite] = (
     "SELECT cid AS column_id, name AS column_name, type AS data_type,\n"
     "  CASE\n"
@@ -164,13 +201,16 @@
     "AND o.name = '{}'\n"
     "ORDER BY c.column_id ")
 find_tab_col_sql[sqlserver] = z.format('U', '{}')
+
 # QUERIES FOR FINDING VIEW COLUMNS.
 
 find_view_col_sql = dict()
 find_view_col_sql[access] = not_possible_sql
-find_view_col_sql[mysql] = not_implemented
+# TODO CHECK THIS
+find_view_col_sql[mysql] = find_tab_col_sql[mysql]
 find_view_col_sql[oracle] = find_tab_col_sql[oracle]
-find_view_col_sql[postgresql] = not_implemented
+# TODO CHECK THIS
+find_view_col_sql[postgresql] = find_tab_col_sql[postgresql]
 find_view_col_sql[sqlite] = find_tab_col_sql[sqlite]
 find_view_col_sql[sqlserver] = z.format('V', '{}')
 

OutputWriter.py

@@ -183,7 +183,7 @@ def write_rows(self, all_rows: list, col_names: list) -> None:
             # Format and print the column names.
             formats = ['{{:^{}}}'.format(size) for size in col_sizes]
             col_names_fmt = self.col_sep.join(formats)
-            self.out_file.write('\n' + col_names_fmt.format(*col_names))
+            self.out_file.write(col_names_fmt.format(*col_names))
 
             # Print line of dashes below the column names.
             dashes = ['-' * col_size for col_size in col_sizes]

README.rst

@@ -7,7 +7,7 @@ REPOSITORY: https://github.com/DavidJLambert/Python-Universal-DB-Client
 
 AUTHOR: David J. Lambert
 
-VERSION: 0.6.1
+VERSION: 0.6.3
 
 DATE: Mar 22, 2020
 

requirements.txt

@@ -4,7 +4,7 @@
 #
 # AUTHOR: David J. Lambert
 #
-# VERSION: 0.6.1
+# VERSION: 0.6.3
 #
 # DATE: Mar 22, 2020
 #

setup.py

@@ -7,7 +7,7 @@
 
 AUTHOR: David J. Lambert
 
-VERSION: 0.6.1
+VERSION: 0.6.3
 
 DATE: Mar 22, 2020
 """

test/__init__.py

@@ -6,7 +6,7 @@
 
 AUTHOR: David J. Lambert
 
-VERSION: 0.6.1
+VERSION: 0.6.3
 
 DATE: Mar 22, 2020
 

test/testUniversalClient.py

@@ -7,7 +7,7 @@
 
 AUTHOR: David J. Lambert
 
-VERSION: 0.6.1
+VERSION: 0.6.3
 
 DATE: Mar 22, 2020
 """

test/testUniversalClientMysql.py

@@ -8,7 +8,7 @@
 
 AUTHOR: David J. Lambert
 
-VERSION: 0.6.1
+VERSION: 0.6.3
 
 DATE: Mar 22, 2020