Add a "null" setting to control upload of NULL values

diff --git a/src/pgwui_upload/pgwui_upload.py b/src/pgwui_upload/pgwui_upload.py
index 1521ccf34e9580aba3d93aa1e6e68027832fd595..83429f88f07dcef3ea0bae8c776758c8c7a585e2 100644 (file)
--- a/src/pgwui_upload/pgwui_upload.py
+++ b/src/pgwui_upload/pgwui_upload.py
@@ -26,6 +26,7 @@ DEFAULT_UPLOAD_ROUTE = '/upload'
 DEFAULT_UPLOAD_MENU_LABEL = 'upload -- Upload File Into Database'
 DEFAULT_LITERAL_COLUMN_HEADINGS = 'no-never'
 DEFAULT_TRIM = 'choice-yes'
+DEFAULT_NULL = 'choice-yes'
 
 
 def init_menu(config):
@@ -41,6 +42,8 @@ def init_menu(config):
         'literal_column_headings', DEFAULT_LITERAL_COLUMN_HEADINGS)
     upload_settings.setdefault(
         'trim', DEFAULT_TRIM)
+    upload_settings.setdefault(
+        'null', DEFAULT_NULL)
 
 
 def includeme(config):

diff --git a/src/pgwui_upload/templates/upload.mak b/src/pgwui_upload/templates/upload.mak
index f2e20e6578ba4e3e54563d0956f3e90e45e25a5f..f0e371a7c42e295fd82d9f5938c57791bf29a283 100644 (file)
--- a/src/pgwui_upload/templates/upload.mak
+++ b/src/pgwui_upload/templates/upload.mak
@@ -30,6 +30,7 @@
 
 
 <%!
+    from pgwui_upload_core.template_utils import show_choice
     from pgwui_common.path import asset_abspath
 
     upload_base_mak = asset_abspath('pgwui_upload_core:templates/upload.mak')
@@ -75,6 +76,8 @@
 
 <%
     form_elements = [table_row]
-    self.append_elements(form_elements) %>
+    self.append_elements(form_elements)
 
-${self.upload_form(form_elements)}
+    self.upload_form(form_elements,
+                     upload_nulls=show_choice(pgwui, 'null'))
+%>