From: Karl O. Pinc Date: Tue, 2 Feb 2021 19:35:20 +0000 (-0600) Subject: Accept schema qualified table names for upload X-Git-Url: https://papio.biology.duke.edu/gitweb/?a=commitdiff_plain;h=908867a10cda2098e1ee2b2fdefa277e9001f8c7;p=pgwui_upload_core Accept schema qualified table names for upload --- diff --git a/src/pgwui_upload_core/views/upload.py b/src/pgwui_upload_core/views/upload.py index 7c90a33..1eca472 100644 --- a/src/pgwui_upload_core/views/upload.py +++ b/src/pgwui_upload_core/views/upload.py @@ -247,6 +247,11 @@ class BaseTableUploadHandler(TabularFileUploadHandler): return x return column_quoter + def quotetable(self, schema, table): + if schema: + return f'{doublequote(schema)}.{doublequote(table)}' + return doublequote(table) + def build_insert_stmt( self, data, qualified_table, quotecols, column_quoter): schema, table = self.validate_table(qualified_table) @@ -259,7 +264,7 @@ class BaseTableUploadHandler(TabularFileUploadHandler): else: column_sql += ' AND columns.column_name = lower(%s::name)' - insert_stmt = 'INSERT INTO {0} ('.format(doublequote(qualified_table)) + insert_stmt = f'INSERT INTO {self.quotetable(schema, table)} (' value_string = '' col_sep = '' bad_cols = []