DAB: Exclude columns

ErikEJ · Jul 29, 2024 · ed9c4a2 · ed9c4a2
1 parent 33d37fc
commit ed9c4a2
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/src/Core/RevEng.Core.80/DataApiBuilderBuilder/DabBuilder.cs b/src/Core/RevEng.Core.80/DataApiBuilderBuilder/DabBuilder.cs
@@ -104,6 +104,8 @@ public string GetDabConfigCmdFile()
                     continue;
                 }
 
+                RemoveExcludedColumns(dbObject);
+
                 var columnList = string.Join(
                     ",",
                     dbObject.Columns
@@ -126,6 +128,8 @@ public string GetDabConfigCmdFile()
                     continue;
                 }
 
+                RemoveExcludedColumns(dbObject);
+
                 var columnList = string.Join(
                     ",",
                     dbObject.Columns
@@ -202,6 +206,22 @@ private static bool BreaksOn(DatabaseTable dbObject)
                 || !dbObject.Columns.Any();
         }
 
+        private void RemoveExcludedColumns(DatabaseTable dbObject)
+        {
+            var excludedColumns = options.Tables.Find(t => t.Name == $"[{dbObject.Schema}].[{dbObject.Name}]")?.ExcludedColumns;
+            if (excludedColumns != null)
+            {
+                foreach (var column in excludedColumns)
+                {
+                    var columnToRemove = dbObject.Columns.FirstOrDefault(c => c.Name.Equals(column, StringComparison.OrdinalIgnoreCase));
+                    if (columnToRemove != null)
+                    {
+                        dbObject.Columns.Remove(columnToRemove);
+                    }
+                }
+            }
+        }
+
         private DatabaseModel GetModelInternal()
         {
             var dbModelFactory = serviceProvider.GetService<IDatabaseModelFactory>();

diff --git a/src/Core/efreveng60/TestFiles/dabtest.json b/src/Core/efreveng60/TestFiles/dabtest.json
@@ -18,7 +18,11 @@
     },
     {
       "Name": "[dbo].[Customers]",
-      "ObjectType": 0
+      "ObjectType": 0,
+      "ExcludedColumns": [
+        "Fax",
+        "Phone"
+      ]
     },
     {
       "Name": "[dbo].[Employees]",

diff --git a/src/GUI/lib/efreveng80.exe.zip b/src/GUI/lib/efreveng80.exe.zip
diff --git a/test/Ef7Playground/Ef7Playground/dab-options.json b/test/Ef7Playground/Ef7Playground/dab-options.json
@@ -13,6 +13,12 @@
          "ObjectType": 0
       },
       {
+         "ExcludedColumns": [
+            "PostalCode",
+            "Phone",
+            "Fax",
+            "Email"
+         ],
          "Name": "[dbo].[Customer]",
          "ObjectType": 0
       },

diff --git a/test/ScaffoldingTester/ScaffoldingTester5/dab-config.cmd b/test/ScaffoldingTester/ScaffoldingTester5/dab-config.cmd
@@ -10,7 +10,7 @@ dab init -c dab-config.json --database-type mssql --connection-string "@env('dab
 dab add "Categories" --source "[dbo].[Categories]" --fields.include "CategoryID,CategoryName,Description,Picture" --permissions "anonymous:*" 
 dab add "CustomerCustomerDemo" --source "[dbo].[CustomerCustomerDemo]" --fields.include "CustomerID,CustomerTypeID" --permissions "anonymous:*" 
 dab add "CustomerDemographics" --source "[dbo].[CustomerDemographics]" --fields.include "CustomerTypeID,CustomerDesc" --permissions "anonymous:*" 
-dab add "Customers" --source "[dbo].[Customers]" --fields.include "CustomerID,CompanyName,ContactName,ContactTitle,Address,City,Region,PostalCode,Country,Phone,Fax,Rating" --permissions "anonymous:*" 
+dab add "Customers" --source "[dbo].[Customers]" --fields.include "CustomerID,CompanyName,ContactName,ContactTitle,Address,City,Region,PostalCode,Country,Rating" --permissions "anonymous:*" 
 dab add "Employees" --source "[dbo].[Employees]" --fields.include "EmployeeID,LastName,FirstName,Title,TitleOfCourtesy,BirthDate,HireDate,Address,City,Region,PostalCode,Country,HomePhone,Extension,Photo,Notes,ReportsTo,PhotoPath" --permissions "anonymous:*" 
 dab add "EmployeeTerritories" --source "[dbo].[EmployeeTerritories]" --fields.include "EmployeeID,TerritoryID" --permissions "anonymous:*" 
 dab add "OrderDetails" --source "[dbo].[Order Details]" --fields.include "OrderID,ProductID,UnitPrice,Quantity,Discount" --permissions "anonymous:*"