From: Karl O. Pinc <kop@karlpinc.com>
Date: Mon, 18 Jan 2021 20:53:20 +0000 (-0600)
Subject: Report error when there's too few data columns
X-Git-Url: https://papio.biology.duke.edu/gitweb/?a=commitdiff_plain;h=d83855eef586ffc3f2dde68d9a6288bc1f3283db;p=pgwui_bulk_upload

Report error when there's too few data columns
---

diff --git a/src/pgwui_bulk_upload/views/bulk_upload.py b/src/pgwui_bulk_upload/views/bulk_upload.py
index ae13dd1..9d0c9bf 100644
--- a/src/pgwui_bulk_upload/views/bulk_upload.py
+++ b/src/pgwui_bulk_upload/views/bulk_upload.py
@@ -37,6 +37,7 @@ import pgwui_core.exceptions as core_ex
 from pgwui_core.core import (
     UploadNullFileWTForm,
     UploadEngine,
+    ParameterExecutor,
     DataLineProcessor,
     UploadNullMixin,
     UploadDoubleFileForm,
@@ -89,7 +90,7 @@ class BulkUploadForm(UploadNullMixin, UploadDoubleFileForm):
         return super().write_response(response)
 
 
-class SaveBulkLine(DataLineProcessor):
+class SaveBulkLine(DataLineProcessor, ParameterExecutor):
     def __init__(self, ue, uh, insert_map):
         '''
         ue             UploadEngine instance
@@ -112,14 +113,12 @@ class SaveBulkLine(DataLineProcessor):
         filepath = data.filepath
         try:
             udl = thunk()
+            self.param_execute(self.insert_map[filepath], udl)
         except (core_ex.DataLineError, core_ex.DBError) as exp:
             relation = data.relation
             exp.color(map_description(filepath, relation),
                       filepath, relation)
             raise exp
-        try:
-            self.cur.execute(
-                self.insert_map[filepath], udl.tuples)
         except psycopg2.DatabaseError as exp:
             relation = data.relation
             myexp = core_ex.DBDataLineError(udl, exp)