feat: handle namespace property for databases (#232)

Author: Seddryck

src/Packata.Core.Testing/Serialization/Json/TableDialectConverterTests.cs

@@ -63,7 +63,8 @@ public void ReadJson_TypeDatabase_ReturnsDatabase()
             {
                 ""$schema"": ""https://datapackage.org/profiles/2.0/tabledialect.json"",
                 ""type"": ""database"",
-                ""table"": ""Customer""
+                ""table"": ""Customer"",
+                ""namespace"": ""dbo""
             }}";
         var wrapper = JsonConvert.DeserializeObject<Wrapper>(json, Settings);
 
@@ -73,6 +74,7 @@ public void ReadJson_TypeDatabase_ReturnsDatabase()
             Assert.That(wrapper.Object, Is.TypeOf<TableDatabaseDialect>());
             var dbDialect = (TableDatabaseDialect)wrapper.Object!;
             Assert.That(dbDialect.Table, Is.EqualTo("Customer"));
+            Assert.That(dbDialect.Namespace, Is.EqualTo("dbo"));
         }
     }
 

src/Packata.Core.Testing/Serialization/Yaml/TableDialectTypeDiscriminatorTests.cs

@@ -61,6 +61,7 @@ public void ReadJson_TypeDatabase_ReturnsCorrectValue()
                     dialect:
                         type: database
                         table: Customer
+                        namespace: Sales
                     ";
 
         var wrapper = Deserializer.Deserialize<Wrapper>(yaml);
@@ -71,6 +72,7 @@ public void ReadJson_TypeDatabase_ReturnsCorrectValue()
             Assert.That(wrapper.Object, Is.TypeOf<TableDatabaseDialect>());
             var dialect = (TableDatabaseDialect)wrapper.Object!;
             Assert.That(dialect.Table, Is.EqualTo("Customer"));
+            Assert.That(dialect.Namespace, Is.EqualTo("Sales"));
         }
     }
 

src/Packata.Core/TableDatabaseDialect.cs

@@ -14,4 +14,9 @@ public class TableDatabaseDialect : TableDialect
     /// The name of the table in the database.
     /// </summary>
     public string? Table { get; set; }
+
+    /// <summary>
+    /// The name of the database schema (namespace).
+    /// </summary>
+    public string? Namespace { get; set; }
 }

src/Packata.ResourceReaders.Testing/Tabular/DatabaseReaderTests.cs

@@ -59,4 +59,49 @@ public void ToDataReader_TableDefined_ExpectedCommand()
         mockConnectionUrl.VerifyAll();
         mockFactory.Verify(x => x.Instantiate("mssql://server/database"), Times.Once);
     }
+
+    [Test]
+    public void ToDataReader_TableAndNamespaceDefined_ExpectedCommand()
+    {
+        var resource = new Resource
+        {
+            Connection = new LiteralConnectionUrl("mssql://server/database"),
+            Type = "table",
+            Name = "my-resource",
+            Dialect = new TableDatabaseDialect() { Table = "Customer", Namespace = "Sales" },
+        };
+        var mockCommand = new Mock<IDbCommand>();
+        mockCommand.Setup(x => x.ExecuteReader()).Returns(Mock.Of<DbDataReader>);
+        mockCommand.SetupSet(x => x.CommandText = It.IsAny<string>());
+
+        var mockConnection = new Mock<IDbConnection>();
+        mockConnection.Setup(x => x.CreateCommand()).Returns(mockCommand.Object);
+
+        var mockRenderer = new Mock<IRenderer>();
+        mockRenderer.Setup(x => x.Render("Customer", It.IsAny<string>())).Returns("Customer");
+        mockRenderer.Setup(x => x.Render("Sales", It.IsAny<string>())).Returns("Sales");
+
+        var mockDialect = new Mock<IDialect>();
+        mockDialect.SetupGet(x => x.Renderer).Returns(mockRenderer.Object);
+
+        var mockConnectionUrl = new Mock<ConnectionUrl>(It.IsAny<string>());
+        mockConnectionUrl.Setup(x => x.Open()).Returns(mockConnection.Object);
+        mockConnectionUrl.SetupGet(x => x.Dialect).Returns(mockDialect.Object);
+
+        var schemeRegistryMock = new Mock<ISchemeRegistry>();
+
+        var mockFactory = new Mock<ConnectionUrlFactory>(schemeRegistryMock.Object);
+        mockFactory.Setup(x => x.Instantiate(It.IsAny<string>())).Returns(mockConnectionUrl.Object);
+
+        var reader = new DatabaseReader(mockFactory.Object);
+        var dataReader = reader.ToDataReader(resource);
+
+        Assert.That(dataReader, Is.Not.Null);
+        mockRenderer.VerifyAll();
+        mockCommand.Verify(x => x.ExecuteReader(), Times.Once);
+        mockCommand.VerifySet(x => x.CommandText = "SELECT * FROM Sales.Customer", Times.Once);
+        mockConnection.VerifyAll();
+        mockConnectionUrl.VerifyAll();
+        mockFactory.Verify(x => x.Instantiate("mssql://server/database"), Times.Once);
+    }
 }

src/Packata.ResourceReaders/Tabular/DatabaseReader.cs

@@ -35,7 +35,9 @@ public IDataReader ToDataReader(Resource resource)
         using (var connection = connectionUrl.Open())
         {
             var command = connection.CreateCommand();
-            command.CommandText = $"SELECT * FROM {connectionUrl.Dialect.Renderer.Render(dialect.Table, "identity")}";
+            command.CommandText = string.IsNullOrEmpty(dialect.Namespace)
+                                ? $"SELECT * FROM {connectionUrl.Dialect.Renderer.Render(dialect.Table, "identity")}"
+                                : $"SELECT * FROM {connectionUrl.Dialect.Renderer.Render(dialect.Namespace, "identity")}.{connectionUrl.Dialect.Renderer.Render(dialect.Table, "identity")}";
             return command.ExecuteReader();
         }
     }