Allow all schemas to fall back to a string value (#25)

[github/fretlink/tap-google-sheets.git] / tap_google_sheets / schema.py

diff --git a/tap_google_sheets/schema.py b/tap_google_sheets/schema.py
index fcaccf9228a759fcb536f525bdcb10fd3b77befc..13e595a4ee8f511a15829914966425bf60237f0a 100644 (file)
--- a/tap_google_sheets/schema.py
+++ b/tap_google_sheets/schema.py
@@ -152,20 +152,7 @@ def get_sheet_schema_columns(sheet):
                 else:
                     # Interesting - order in the anyOf makes a difference.
                     # Number w/ multipleOf must be listed last, otherwise errors occur.
-                    col_properties =  {
-                        'anyOf': [
-                            {
-                                'type': 'null'
-                            },
-                            {
-                                'type': 'number',
-                                'multipleOf': 1e-15
-                            },
-                            {
-                                'type': 'string'
-                            }
-                        ]
-                    }
+                    col_properties = {'type': 'number', 'multipleOf': 1e-15}
                     column_gs_type = 'numberType'
             # Catch-all to deal with other types and set to string
             # column_effective_value_type: formulaValue, errorValue, or other
@@ -205,6 +192,14 @@ def get_sheet_schema_columns(sheet):
             }
             columns.append(column)
 
+            if column_gs_type in {'numberType.DATE_TIME', 'numberType.DATE', 'numberType.TIME', 'numberType'}:
+                col_properties = {
+                    'anyOf': [
+                        col_properties,
+                        {'type': ['null', 'string']}
+                    ]
+                }
+
             sheet_json_schema['properties'][column_name] = col_properties
 
         prior_header = column_name