Making the EntitySource.Type nullable (#1530)

When it is a CosmosDB_NoSQL config, the entity 'type' is not important as there are no types in CosmosDB_NoSQL, so we don't want anything there. Combining this with #1529 will see the value removed from the config entirely
Azure · Jun 22, 2023 · 59456c5 · 59456c5
1 parent 2cbd53c
commit 59456c5
Show file tree

Hide file tree

Showing 39 changed files with 319 additions and 331 deletions.
diff --git a/src/Auth/AuthorizationMetadataHelpers.cs b/src/Auth/AuthorizationMetadataHelpers.cs
@@ -42,12 +42,6 @@ public class EntityMetadata
         /// Set of Http verbs enabled for Stored Procedure entities that have their REST endpoint enabled.
         /// </summary>
         public HashSet<SupportedHttpVerb> StoredProcedureHttpVerbs { get; set; } = new();
-
-        /// <summary>
-        /// Defines the type of database object the entity represents.
-        /// Examples include Table, View, StoredProcedure
-        /// </summary>
-        public EntitySourceType ObjectType { get; set; } = EntitySourceType.Table;
     }
 
     /// <summary>

diff --git a/...sts/Snapshots/AddEntityTests.AddEntityWithAnExistingNameButWithDifferentCase.verified.txt b/...sts/Snapshots/AddEntityTests.AddEntityWithAnExistingNameButWithDifferentCase.verified.txt
@@ -30,7 +30,8 @@
     {
       FirstEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: FirstEntity,
@@ -67,7 +68,8 @@
     {
       FIRSTEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: FIRSTEntity,

diff --git a/...pshots/AddEntityTests.AddEntityWithPolicyAndFieldProperties_70de36ebf1478d0d.verified.txt b/...pshots/AddEntityTests.AddEntityWithPolicyAndFieldProperties_70de36ebf1478d0d.verified.txt
@@ -30,7 +30,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/...pshots/AddEntityTests.AddEntityWithPolicyAndFieldProperties_9f612e68879149a3.verified.txt b/...pshots/AddEntityTests.AddEntityWithPolicyAndFieldProperties_9f612e68879149a3.verified.txt
@@ -30,7 +30,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/...pshots/AddEntityTests.AddEntityWithPolicyAndFieldProperties_bea2d26f3e5462d8.verified.txt b/...pshots/AddEntityTests.AddEntityWithPolicyAndFieldProperties_bea2d26f3e5462d8.verified.txt
@@ -30,7 +30,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/src/Cli.Tests/Snapshots/AddEntityTests.AddNewEntityWhenEntitiesEmpty.verified.txt b/src/Cli.Tests/Snapshots/AddEntityTests.AddNewEntityWhenEntitiesEmpty.verified.txt
@@ -30,7 +30,8 @@
     {
       FirstEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: FirstEntity,

diff --git a/src/Cli.Tests/Snapshots/AddEntityTests.AddNewEntityWhenEntitiesNotEmpty.verified.txt b/src/Cli.Tests/Snapshots/AddEntityTests.AddNewEntityWhenEntitiesNotEmpty.verified.txt
@@ -30,7 +30,8 @@
     {
       FirstEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: FirstEntity,
@@ -67,7 +68,8 @@
     {
       SecondEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: SecondEntity,

diff --git a/.../EndToEndTests.TestConfigGeneratedAfterAddingEntityWithSourceWithDefaultType.verified.txt b/.../EndToEndTests.TestConfigGeneratedAfterAddingEntityWithSourceWithDefaultType.verified.txt
@@ -32,6 +32,7 @@
       MyEntity: {
         Source: {
           Object: s001.book,
+          Type: Table,
           KeyFields: [
             id,
             name

diff --git a/...pshots/EndToEndTests.TestConfigGeneratedAfterAddingEntityWithoutIEnumerables.verified.txt b/...pshots/EndToEndTests.TestConfigGeneratedAfterAddingEntityWithoutIEnumerables.verified.txt
@@ -32,7 +32,8 @@
     {
       book: {
         Source: {
-          Object: s001.book
+          Object: s001.book,
+          Type: Table
         },
         GraphQL: {
           Singular: book,

diff --git a/...ts/Snapshots/UpdateEntityTests.TestConversionOfSourceObject_103655d39b48d89f.verified.txt b/...ts/Snapshots/UpdateEntityTests.TestConversionOfSourceObject_103655d39b48d89f.verified.txt
@@ -31,6 +31,7 @@
       MyEntity: {
         Source: {
           Object: s001.book,
+          Type: Table,
           KeyFields: [
             id,
             name

diff --git a/...ts/Snapshots/UpdateEntityTests.TestConversionOfSourceObject_7f2338fdc84aafc3.verified.txt b/...ts/Snapshots/UpdateEntityTests.TestConversionOfSourceObject_7f2338fdc84aafc3.verified.txt
@@ -30,7 +30,8 @@
     {
       MyEntity: {
         Source: {
-          Object: s001.book
+          Object: s001.book,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/...li.Tests/Snapshots/UpdateEntityTests.TestUpdateEntityByAddingNewRelationship.verified.txt b/...li.Tests/Snapshots/UpdateEntityTests.TestUpdateEntityByAddingNewRelationship.verified.txt
@@ -29,7 +29,8 @@
     {
       FirstEntity: {
         Source: {
-          Object: Table1
+          Object: Table1,
+          Type: Table
         },
         GraphQL: {
           Singular: FirstEntity,
@@ -71,7 +72,8 @@
     {
       SecondEntity: {
         Source: {
-          Object: Table2
+          Object: Table2,
+          Type: Table
         },
         GraphQL: {
           Singular: SecondEntity,

diff --git a/...li.Tests/Snapshots/UpdateEntityTests.TestUpdateEntityByModifyingRelationship.verified.txt b/...li.Tests/Snapshots/UpdateEntityTests.TestUpdateEntityByModifyingRelationship.verified.txt
@@ -29,7 +29,8 @@
     {
       FirstEntity: {
         Source: {
-          Object: Table1
+          Object: Table1,
+          Type: Table
         },
         GraphQL: {
           Singular: FirstEntity,
@@ -71,7 +72,8 @@
     {
       SecondEntity: {
         Source: {
-          Object: Table2
+          Object: Table2,
+          Type: Table
         },
         GraphQL: {
           Singular: SecondEntity,

diff --git a/src/Cli.Tests/Snapshots/UpdateEntityTests.TestUpdateEntityPermission.verified.txt b/src/Cli.Tests/Snapshots/UpdateEntityTests.TestUpdateEntityPermission.verified.txt
@@ -29,7 +29,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/....Tests/Snapshots/UpdateEntityTests.TestUpdateEntityPermissionByAddingNewRole.verified.txt b/....Tests/Snapshots/UpdateEntityTests.TestUpdateEntityPermissionByAddingNewRole.verified.txt
@@ -29,7 +29,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/...s/Snapshots/UpdateEntityTests.TestUpdateEntityPermissionHavingWildcardAction.verified.txt b/...s/Snapshots/UpdateEntityTests.TestUpdateEntityPermissionHavingWildcardAction.verified.txt
@@ -29,7 +29,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/...sts/Snapshots/UpdateEntityTests.TestUpdateEntityPermissionWithExistingAction.verified.txt b/...sts/Snapshots/UpdateEntityTests.TestUpdateEntityPermissionWithExistingAction.verified.txt
@@ -29,7 +29,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/...sts/Snapshots/UpdateEntityTests.TestUpdateEntityPermissionWithWildcardAction.verified.txt b/...sts/Snapshots/UpdateEntityTests.TestUpdateEntityPermissionWithWildcardAction.verified.txt
@@ -29,7 +29,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/src/Cli.Tests/Snapshots/UpdateEntityTests.TestUpdateEntityWithMappings.verified.txt b/src/Cli.Tests/Snapshots/UpdateEntityTests.TestUpdateEntityWithMappings.verified.txt
@@ -29,7 +29,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/...ateEntityTests.TestUpdateEntityWithPolicyAndFieldProperties_088d6237033e0a7c.verified.txt b/...ateEntityTests.TestUpdateEntityWithPolicyAndFieldProperties_088d6237033e0a7c.verified.txt
@@ -30,7 +30,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/...ateEntityTests.TestUpdateEntityWithPolicyAndFieldProperties_3ea32fdef7aed1b4.verified.txt b/...ateEntityTests.TestUpdateEntityWithPolicyAndFieldProperties_3ea32fdef7aed1b4.verified.txt
@@ -30,7 +30,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/...ateEntityTests.TestUpdateEntityWithPolicyAndFieldProperties_4d25c2c012107597.verified.txt b/...ateEntityTests.TestUpdateEntityWithPolicyAndFieldProperties_4d25c2c012107597.verified.txt
@@ -30,7 +30,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/...s/Snapshots/UpdateEntityTests.TestUpdateEntityWithSpecialCharacterInMappings.verified.txt b/...s/Snapshots/UpdateEntityTests.TestUpdateEntityWithSpecialCharacterInMappings.verified.txt
@@ -29,7 +29,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/src/Cli.Tests/Snapshots/UpdateEntityTests.TestUpdateExistingMappings.verified.txt b/src/Cli.Tests/Snapshots/UpdateEntityTests.TestUpdateExistingMappings.verified.txt
@@ -29,7 +29,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/src/Cli.Tests/Snapshots/UpdateEntityTests.TestUpdatePolicy.verified.txt b/src/Cli.Tests/Snapshots/UpdateEntityTests.TestUpdatePolicy.verified.txt
@@ -30,7 +30,8 @@
     {
       MyEntity: {
         Source: {
-          Object: MyTable
+          Object: MyTable,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/...ateEntityTests.TestUpdateSourceStringToDatabaseSourceObject_a13a9ca73b21f261.verified.txt b/...ateEntityTests.TestUpdateSourceStringToDatabaseSourceObject_a13a9ca73b21f261.verified.txt
@@ -31,6 +31,7 @@
       MyEntity: {
         Source: {
           Object: s001.book,
+          Type: Table,
           KeyFields: [
             id,
             name

diff --git a/...ateEntityTests.TestUpdateSourceStringToDatabaseSourceObject_a5ce76c8bea25cc8.verified.txt b/...ateEntityTests.TestUpdateSourceStringToDatabaseSourceObject_a5ce76c8bea25cc8.verified.txt
@@ -31,6 +31,7 @@
       MyEntity: {
         Source: {
           Object: s001.book,
+          Type: Table,
           KeyFields: [
             id,
             name

diff --git a/...ateEntityTests.TestUpdateSourceStringToDatabaseSourceObject_bba111332a1f973f.verified.txt b/...ateEntityTests.TestUpdateSourceStringToDatabaseSourceObject_bba111332a1f973f.verified.txt
@@ -30,7 +30,8 @@
     {
       MyEntity: {
         Source: {
-          Object: s001.book
+          Object: s001.book,
+          Type: Table
         },
         GraphQL: {
           Singular: MyEntity,

diff --git a/src/Cli.Tests/Snapshots/UpdateEntityTests.UpdateDatabaseSourceKeyFields.verified.txt b/src/Cli.Tests/Snapshots/UpdateEntityTests.UpdateDatabaseSourceKeyFields.verified.txt
@@ -31,6 +31,7 @@
       MyEntity: {
         Source: {
           Object: s001.book,
+          Type: Table,
           KeyFields: [
             col1,
             col2