Handle nulls correctly

pyproject.toml

@@ -12,7 +12,7 @@ homepage = "https://github.com/piotrgredowski/table2sql"
 license = "MIT"
 name = "table2sql"
 readme = "README.md"
-version = "1.0.0"
+version = "1.0.1"
 
 [tool.poetry.urls]
 "Bug Tracker" = "https://github.com/piotrgredowski/table2sql/issues"

table2sql/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 
 from .main import convert_table_file_to_insert_statement  # noqa: F401

table2sql/main.py

@@ -16,6 +16,7 @@
     "float": float,
     "str": lambda value: f"'{value}'",
     "sql": lambda sql: sql,
+    "null": lambda _: "NULL",
 }
 
 
@@ -26,10 +27,13 @@ def _get_columns_formatted(column_names: Iterable[str]):
 def _get_values_formatted(values: Iterable[str], types: Optional[List[Callable]]):
     values_ = []
     for row in values:
+
         if types:
-            row = [str(type_(value)) for type_, value in zip(types, row)]
+            row = [
+                "NULL" if value is None else str(type_(value)) for type_, value in zip(types, row)
+            ]
         else:
-            row = [str(value) for value in row]
+            row = ["NULL" if value is None else str(value) for value in row]
         values_.append(f'({", ".join(row)})')
 
     return ", ".join(values_)
@@ -46,8 +50,8 @@ def _get_insert_statement_formatted(
 def _get_types_functions(types_str: Tuple[str, ...]):
     types_functions = []
     for type_str in types_str:
+        type_str = type_str.lower()
         try:
-
             type_ = TYPES_MAP[type_str]
         except KeyError:
             type_ = str

tests/test_main.py

@@ -201,3 +201,17 @@ def test_convert_table_file_to_insert_statement_from_excel_with_multiple_sheets(
     os.remove(test_filename)
 
     assert result_insert_statement == expected
+
+
+def test_file_with_empty_columns():
+    result = convert_table_file_to_insert_statement(
+        path_to_file="./tests/excel/test_file_with_empty_columns.xlsx",
+        output_table="test.table",
+        delimiter="not relevant",
+        has_types_row=True,
+    )
+    expected = """
+INSERT INTO test.table (a, b, c, d)
+VALUES (1, NULL, 3.0, (SELECT 1)), (5, '6', NULL, (SELECT 1));""".strip()
+
+    assert result == expected