From 3ad969cc0ffc974419baec3e8e7c6c4b970e66cf Mon Sep 17 00:00:00 2001
From: Erik Ejlskov Jensen <ErikEJ@users.noreply.github.com>
Date: Wed, 23 Oct 2024 15:20:07 +0200
Subject: [PATCH 1/3] Create schema2.json

---
 samples/schema2.json | 232 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 232 insertions(+)
 create mode 100644 samples/schema2.json

diff --git a/samples/schema2.json b/samples/schema2.json
new file mode 100644
index 000000000..e3d244fe6
--- /dev/null
+++ b/samples/schema2.json
@@ -0,0 +1,232 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "$schema": {
+      "type": "string"
+    },
+    "code-generation": {
+      "$ref": "#/definitions/CodeGeneration"
+    },
+    "tables": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Table"
+      }
+    },
+    "views": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/View"
+      }
+    },
+    "stored-procedures": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/StoredProcedure"
+      }
+    },
+    "functions": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Function"
+      }
+    },
+    "names": {
+      "$ref": "#/definitions/Names"
+    },
+    "file-layout": {
+      "$ref": "#/definitions/FileLayout"
+    },
+    "replacements": {
+      "$ref": "#/definitions/Replacements"
+    },
+    "type-mappings": {
+      "$ref": "#/definitions/TypeMappings"
+    }
+  },
+  "definitions": {
+    "Table": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "exclude": {
+          "type": "boolean"
+        }
+      }
+    },
+    "View": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        }
+      }
+    },
+    "StoredProcedure": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "use-legacy-resultset-discovery": {
+          "type": "boolean"
+        },
+        "mapped-type": {
+          "type": "string"
+        }
+      }
+    },
+    "Function": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        }
+      }
+    },
+    "CodeGeneration": {
+      "type": "object",
+      "properties": {
+        "enable-on-configuring": {
+          "type": "boolean"
+        },
+        "type": {
+          "default": "all",
+          "enum": [ "all", "dbcontext", "entities" ],
+          "type": "string"
+        },
+        "use-database-names": {
+          "type": "boolean"
+        },
+        "use-data-annotations": {
+          "type": "boolean"
+        },
+        "use-nullable-reference-types": {
+          "type": "boolean"
+        },
+        "use-inflector": {
+          "type": "boolean",
+          "default": true
+        },
+        "use-legacy-inflector": {
+          "type": "boolean"
+        },
+        "use-many-to-many-entity": {
+          "type": "boolean"
+        },
+        "use-t4": {
+          "type": "boolean"
+        },
+        "remove-defaultsql-from-bool-properties": {
+          "type": "boolean"
+        },
+        "soft-delete-obsolete-files": {
+          "type": "boolean"
+        },
+        "discover-multiple-stored-procedure-resultsets-preview": {
+          "type": "boolean"
+        },
+        "use-alternate-stored-procedure-resultset-discovery": {
+          "type": "boolean"
+        },
+        "t4-template-path": {
+          "type": [ "string", "null" ]
+        },
+        "use-no-navigations-preview": {
+          "type": "boolean"
+        },
+        "merge-dacpacs": {
+          "type": "boolean"
+        },
+        "refresh-object-lists": {
+          "type": "boolean",
+          "default": true
+        },
+        "generate-mermaid-diagram": {
+          "type": "boolean"
+        },
+        "use-decimal-data-annotation-for-sproc-results" {
+          "type": "boolean",
+          "default": true
+        },
+        "use-prefix-navigation-naming" {
+          "type": "boolean"
+        }
+      }
+    },
+    "Names": {
+      "type": "object",
+      "properties": {
+        "root-namespace": {
+          "type": "string"
+        },
+        "dbcontext-name": {
+          "type": "string"
+        },
+        "dbcontext-namespace": {
+          "type": "string"
+        },
+        "model-namespace": {
+          "type": "string"
+        }
+      }
+    },
+    "FileLayout": {
+      "type": "object",
+      "properties": {
+        "output-path": {
+          "type": "string"
+        },
+        "output-dbcontext-path": {
+          "type": "string"
+        },
+        "split-dbcontext-preview": {
+          "type": "boolean"
+        },
+        "use-schema-folders-preview": {
+          "type": "boolean"
+        },
+        "use-schema-namespaces-preview": {
+          "type": "boolean"
+        }
+      }
+    },
+    "TypeMappings": {
+      "type": "object",
+      "properties": {
+        "use-DateOnly-TimeOnly": {
+          "type": "boolean"
+        },
+        "use-HierarchyId": {
+          "type": "boolean"
+        },
+        "use-spatial": {
+          "type": "boolean"
+        },
+        "use-NodaTime": {
+          "type": "boolean"
+        }
+      }
+    },
+    "Replacements": {
+      "type": "object",
+      "properties": {
+        "preserve-casing-with-regex": {
+          "type": "boolean"
+        },
+        "uncountable-words": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/UncountableWord"
+          }
+        }
+      }
+    },
+    "UncountableWord": {
+      "type": "string"
+    }
+  }
+}

From 87dde1a8ba24a15792c1b98744637f6b29fa96c8 Mon Sep 17 00:00:00 2001
From: Erik Ejlskov Jensen <ErikEJ@users.noreply.github.com>
Date: Wed, 23 Oct 2024 15:22:10 +0200
Subject: [PATCH 2/3] Delete samples/schema2.json

---
 samples/schema2.json | 232 -------------------------------------------
 1 file changed, 232 deletions(-)
 delete mode 100644 samples/schema2.json

diff --git a/samples/schema2.json b/samples/schema2.json
deleted file mode 100644
index e3d244fe6..000000000
--- a/samples/schema2.json
+++ /dev/null
@@ -1,232 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "type": "object",
-  "properties": {
-    "$schema": {
-      "type": "string"
-    },
-    "code-generation": {
-      "$ref": "#/definitions/CodeGeneration"
-    },
-    "tables": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/Table"
-      }
-    },
-    "views": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/View"
-      }
-    },
-    "stored-procedures": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/StoredProcedure"
-      }
-    },
-    "functions": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/Function"
-      }
-    },
-    "names": {
-      "$ref": "#/definitions/Names"
-    },
-    "file-layout": {
-      "$ref": "#/definitions/FileLayout"
-    },
-    "replacements": {
-      "$ref": "#/definitions/Replacements"
-    },
-    "type-mappings": {
-      "$ref": "#/definitions/TypeMappings"
-    }
-  },
-  "definitions": {
-    "Table": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "exclude": {
-          "type": "boolean"
-        }
-      }
-    },
-    "View": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      }
-    },
-    "StoredProcedure": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "use-legacy-resultset-discovery": {
-          "type": "boolean"
-        },
-        "mapped-type": {
-          "type": "string"
-        }
-      }
-    },
-    "Function": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      }
-    },
-    "CodeGeneration": {
-      "type": "object",
-      "properties": {
-        "enable-on-configuring": {
-          "type": "boolean"
-        },
-        "type": {
-          "default": "all",
-          "enum": [ "all", "dbcontext", "entities" ],
-          "type": "string"
-        },
-        "use-database-names": {
-          "type": "boolean"
-        },
-        "use-data-annotations": {
-          "type": "boolean"
-        },
-        "use-nullable-reference-types": {
-          "type": "boolean"
-        },
-        "use-inflector": {
-          "type": "boolean",
-          "default": true
-        },
-        "use-legacy-inflector": {
-          "type": "boolean"
-        },
-        "use-many-to-many-entity": {
-          "type": "boolean"
-        },
-        "use-t4": {
-          "type": "boolean"
-        },
-        "remove-defaultsql-from-bool-properties": {
-          "type": "boolean"
-        },
-        "soft-delete-obsolete-files": {
-          "type": "boolean"
-        },
-        "discover-multiple-stored-procedure-resultsets-preview": {
-          "type": "boolean"
-        },
-        "use-alternate-stored-procedure-resultset-discovery": {
-          "type": "boolean"
-        },
-        "t4-template-path": {
-          "type": [ "string", "null" ]
-        },
-        "use-no-navigations-preview": {
-          "type": "boolean"
-        },
-        "merge-dacpacs": {
-          "type": "boolean"
-        },
-        "refresh-object-lists": {
-          "type": "boolean",
-          "default": true
-        },
-        "generate-mermaid-diagram": {
-          "type": "boolean"
-        },
-        "use-decimal-data-annotation-for-sproc-results" {
-          "type": "boolean",
-          "default": true
-        },
-        "use-prefix-navigation-naming" {
-          "type": "boolean"
-        }
-      }
-    },
-    "Names": {
-      "type": "object",
-      "properties": {
-        "root-namespace": {
-          "type": "string"
-        },
-        "dbcontext-name": {
-          "type": "string"
-        },
-        "dbcontext-namespace": {
-          "type": "string"
-        },
-        "model-namespace": {
-          "type": "string"
-        }
-      }
-    },
-    "FileLayout": {
-      "type": "object",
-      "properties": {
-        "output-path": {
-          "type": "string"
-        },
-        "output-dbcontext-path": {
-          "type": "string"
-        },
-        "split-dbcontext-preview": {
-          "type": "boolean"
-        },
-        "use-schema-folders-preview": {
-          "type": "boolean"
-        },
-        "use-schema-namespaces-preview": {
-          "type": "boolean"
-        }
-      }
-    },
-    "TypeMappings": {
-      "type": "object",
-      "properties": {
-        "use-DateOnly-TimeOnly": {
-          "type": "boolean"
-        },
-        "use-HierarchyId": {
-          "type": "boolean"
-        },
-        "use-spatial": {
-          "type": "boolean"
-        },
-        "use-NodaTime": {
-          "type": "boolean"
-        }
-      }
-    },
-    "Replacements": {
-      "type": "object",
-      "properties": {
-        "preserve-casing-with-regex": {
-          "type": "boolean"
-        },
-        "uncountable-words": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/UncountableWord"
-          }
-        }
-      }
-    },
-    "UncountableWord": {
-      "type": "string"
-    }
-  }
-}

From 20e44a4f5b83cf2b82abfb14896bb29756d5187c Mon Sep 17 00:00:00 2001
From: Erik Ejlskov Jensen <ErikEJ@users.noreply.github.com>
Date: Wed, 23 Oct 2024 15:23:52 +0200
Subject: [PATCH 3/3] Update efcpt-config.schema.json

---
 samples/efcpt-config.schema.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/samples/efcpt-config.schema.json b/samples/efcpt-config.schema.json
index 098637749..1131a02fa 100644
--- a/samples/efcpt-config.schema.json
+++ b/samples/efcpt-config.schema.json
@@ -161,16 +161,16 @@
       "type": "object",
       "properties": {
         "root-namespace": {
-          "type": "string"
+          "type": [ "string", "null" ]
         },
         "dbcontext-name": {
           "type": "string"
         },
         "dbcontext-namespace": {
-          "type": "string"
+          "type": [ "string", "null" ]
         },
         "model-namespace": {
-          "type": "string"
+          "type": [ "string", "null" ]
         }
       }
     },
@@ -181,7 +181,7 @@
           "type": "string"
         },
         "output-dbcontext-path": {
-          "type": "string"
+          "type": [ "string", "null" ]
         },
         "split-dbcontext-preview": {
           "type": "boolean"
@@ -229,4 +229,4 @@
       "type": "string"
     }
   }
-}
\ No newline at end of file
+}