microsoft
/
Power-Fx
зеркало из https://github.com/microsoft/Power-Fx.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Use logical names and running a single query to get relationships (#2662) 

Use logical names and running a single query to get relationships for
Azure SQL

---------

Co-authored-by: Luc Genetier <lucgen@microsoft.com>
Co-authored-by: Luc Genetier <69138830+LucGenetier@users.noreply.github.com>
Co-authored-by: Marimuthu Gurusamy <magurusa@microsoft.com>
This commit is contained in:
Mari 2024-10-02 10:07:33 -07:00 коммит произвёл GitHub
Родитель f3a260a6b2
Коммит 90a489ac68
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 90 добавлений и 7497 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

121
src/libraries/Microsoft.PowerFx.Connectors/Tabular/CdpTableResolver.cs
Просмотреть файл

@ -65,34 +65,23 @@ namespace Microsoft.PowerFx.Connectors
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
// We can't execute a query like below for unknown reasons so we'll have to do it in retrieving each table's data
// and doing the joins manually (in GetSqlRelationships)
// --
// SELECT fk.name 'FK Name', tp.name 'Parent table', cp.name, tr.name 'Refrenced table', cr.name
// FROM sys.foreign_keys fk
// INNER JOIN sys.tables tp ON fk.parent_object_id = tp.object_id
// INNER JOIN sys.tables tr ON fk.referenced_object_id = tr.object_id
// INNER JOIN sys.foreign_key_columns fkc ON fkc.constraint_object_id = fk.object_id
// INNER JOIN sys.columns cp ON fkc.parent_column_id = cp.column_id AND fkc.parent_object_id = cp.object_id
// INNER JOIN sys.columns cr ON fkc.referenced_column_id = cr.column_id AND fkc.referenced_object_id = cr.object_id
// ORDER BY tp.name, cp.column_id
// --
uri = (_uriPrefix ?? string.Empty) + $"/v2/datasets/{dataset}/query/sql"; uri = (_uriPrefix ?? string.Empty) + $"/v2/datasets/{dataset}/query/sql";
string body = string body =
@"{""query"":""select name, object_id, parent_object_id, referenced_object_id from sys.foreign_keys; " + @"{""query"":""SELECT fk.name AS FK_Name, '[' + sp.name + '].[' + tp.name + ']' AS Parent_Table, cp.name AS Parent_Column, '[' + sr.name + '].[' + tr.name + ']' AS Referenced_Table, cr.name AS Referenced_Column" +
@"select object_id, name from sys.tables; " + @" FROM sys.foreign_keys fk" +
@"select constraint_object_id, parent_column_id, parent_object_id, referenced_column_id, referenced_object_id from sys.foreign_key_columns; " + @" INNER JOIN sys.tables tp ON fk.parent_object_id = tp.object_id" +
@"select name, object_id, column_id from sys.columns""}"; @" INNER JOIN sys.tables tr ON fk.referenced_object_id = tr.object_id" +
@" INNER JOIN sys.schemas sp on tp.schema_id = sp.schema_id" +
@" INNER JOIN sys.schemas sr on tr.schema_id = sr.schema_id" +
@" INNER JOIN sys.foreign_key_columns fkc ON fkc.constraint_object_id = fk.object_id" +
@" INNER JOIN sys.columns cp ON fkc.parent_column_id = cp.column_id AND fkc.parent_object_id = cp.object_id" +
@" INNER JOIN sys.columns cr ON fkc.referenced_column_id = cr.column_id AND fkc.referenced_object_id = cr.object_id" +
@" WHERE '[' + sp.name + '].[' + tp.name + ']' = '" + tableName + "'" + @"""}";
string text2 = await CdpServiceBase.GetObject(_httpClient, $"Get SQL relationships", uri, body, cancellationToken, Logger).ConfigureAwait(false); string text2 = await CdpServiceBase.GetObject(_httpClient, $"Get SQL relationships", uri, body, cancellationToken, Logger).ConfigureAwait(false);
// Result should be cached // Result should be cached
sqlRelationships = GetSqlRelationships(text2); sqlRelationships = GetSqlRelationships(text2);
// Filter on ParentTable
string tbl = tableName.Split('.').Last().Replace("[", string.Empty).Replace("]", string.Empty);
sqlRelationships = sqlRelationships.Where(sr => sr.ParentTable == tbl).ToList();
} }
string connectorName = _uriPrefix.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries)[1]; string connectorName = _uriPrefix.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries)[1];
@ -107,51 +96,30 @@ namespace Microsoft.PowerFx.Connectors
private bool IsSql() => _uriPrefix.Contains("/sql/"); private bool IsSql() => _uriPrefix.Contains("/sql/");
private List<SqlRelationship> GetSqlRelationships(string text) private List<SqlRelationship> GetSqlRelationships(string text)
{ {
Result r = JsonSerializer.Deserialize<Result>(text); RelationshipResult r = JsonSerializer.Deserialize<RelationshipResult>(text);
SqlForeignKey[] fkt = r.ResultSets.Table1; var relationships = r.ResultSets.Table1;
if (relationships == null || relationships.Length == 0)
if (fkt == null || fkt.Length == 0)
{ {
return new List<SqlRelationship>(); return new List<SqlRelationship>();
} }
SqlTable[] tt = r.ResultSets.Table2;
SqlForeignKeyColumn[] fkct = r.ResultSets.Table3;
SqlColumn[] ct = r.ResultSets.Table4;
List<SqlRelationship> sqlRelationShips = new List<SqlRelationship>(); List<SqlRelationship> sqlRelationShips = new List<SqlRelationship>();
foreach (SqlForeignKey fk in fkt) foreach (var fk in relationships)
{ {
foreach (SqlTable tp in tt.Where(tp => fk.parent_object_id == tp.object_id)) sqlRelationShips.Add(new SqlRelationship()
{ {
foreach (SqlTable tr in tt.Where(tr => fk.referenced_object_id == tr.object_id)) RelationshipName = fk.FK_Name,
{ ParentTable = fk.Parent_Table,
foreach (SqlForeignKeyColumn fkc in fkct.Where(fkc => fkc.constraint_object_id == fk.object_id)) ColumnName = fk.Parent_Column,
{ ReferencedTable = fk.Referenced_Table,
foreach (SqlColumn cp in ct.Where(cp => fkc.parent_column_id == cp.column_id && fkc.parent_object_id == cp.object_id)) ReferencedColumnName = fk.Referenced_Column
{ });
foreach (SqlColumn cr in ct.Where(cr => fkc.referenced_column_id == cr.column_id && fkc.referenced_object_id == cr.object_id))
{
sqlRelationShips.Add(new SqlRelationship()
{
RelationshipName = fk.name,
ParentTable = tp.name,
ColumnName = cp.name,
ReferencedTable = tr.name,
ReferencedColumnName = cr.name,
ColumnId = cp.column_id
});
}
}
}
}
}
} }
return sqlRelationShips.OrderBy(sr => sr.ParentTable).ThenBy(sr => sr.ColumnId).ToList(); return sqlRelationShips;
} }
} }
@ -165,52 +133,31 @@ namespace Microsoft.PowerFx.Connectors
public string ColumnName; public string ColumnName;
public string ReferencedTable; public string ReferencedTable;
public string ReferencedColumnName; public string ReferencedColumnName;
public long ColumnId;
public override string ToString() => $"{RelationshipName}, {ParentTable}, {ColumnName}, {ReferencedTable}, {ReferencedColumnName}"; public override string ToString() => $"{RelationshipName}, {ParentTable}, {ColumnName}, {ReferencedTable}, {ReferencedColumnName}";
} }
internal class Result internal class RelationshipResult
{ {
public ResultSets ResultSets { get; set; } public RelationshipResultSets ResultSets { get; set; }
} }
internal class ResultSets internal class RelationshipResultSets
{ {
public SqlForeignKey[] Table1 { get; set; } public FKRelationship[] Table1 { get; set; }
public SqlTable[] Table2 { get; set; }
public SqlForeignKeyColumn[] Table3 { get; set; }
public SqlColumn[] Table4 { get; set; }
} }
internal class SqlForeignKey internal class FKRelationship
{ {
public string name { get; set; } public string FK_Name { get; set; }
public long object_id { get; set; }
public long parent_object_id { get; set; }
public long referenced_object_id { get; set; }
}
internal class SqlTable public string Parent_Table { get; set; }
{
public long object_id { get; set; }
public string name { get; set; }
}
internal class SqlForeignKeyColumn public string Parent_Column { get; set; }
{
public long constraint_object_id { get; set; }
public long parent_column_id { get; set; }
public long parent_object_id { get; set; }
public long referenced_column_id { get; set; }
public long referenced_object_id { get; set; }
}
internal class SqlColumn public string Referenced_Table { get; set; }
{
public string name { get; set; } public string Referenced_Column { get; set; }
public long object_id { get; set; }
public long column_id { get; set; }
} }
#pragma warning restore SA1516 #pragma warning restore SA1516

145
src/tests/Microsoft.PowerFx.Connectors.Tests.Shared/PowerPlatformConnectorTests.cs
Просмотреть файл

@ -21,6 +21,7 @@ using Microsoft.PowerFx.Core.Tests;
using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Types;
using Microsoft.PowerFx.Functions; using Microsoft.PowerFx.Functions;
using Microsoft.PowerFx.Intellisense; using Microsoft.PowerFx.Intellisense;
using Microsoft.PowerFx.Syntax;
using Microsoft.PowerFx.Types; using Microsoft.PowerFx.Types;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
@ -1382,30 +1383,24 @@ namespace Microsoft.PowerFx.Tests
var config = new PowerFxConfig(Features.PowerFxV1); var config = new PowerFxConfig(Features.PowerFxV1);
using var httpClient = new HttpClient(testConnector); using var httpClient = new HttpClient(testConnector);
string jwt = "eyJ0eXAi..."; string jwt = "eyJ0eXAiO...";
using var client = new PowerPlatformConnectorClient("firstrelease-003.azure-apihub.net", "49970107-0806-e5a7-be5e-7c60e2750f01", "29941b77eb0a40fe925cd7a03cb85b40", () => jwt, httpClient) { SessionId = "8e67ebdc-d402-455a-b33a-304820832383" }; using var client = new PowerPlatformConnectorClient("4d4a8e81-17a4-4a92-9bfe-8d12e607fb7f.08.common.tip1.azure-apihub.net", "4d4a8e81-17a4-4a92-9bfe-8d12e607fb7f", "53f515b50c3e4925803ec1f0945e799f", () => jwt, httpClient) { SessionId = "8e67ebdc-d402-455a-b33a-304820832383" };
config.AddActionConnector(new ConnectorSettings("SQL") { IncludeInternalFunctions = true, AllowUnsupportedFunctions = true }, apiDoc, new ConsoleLogger(_output)); config.AddActionConnector(new ConnectorSettings("SQL") { IncludeInternalFunctions = true, AllowUnsupportedFunctions = true }, apiDoc, new ConsoleLogger(_output));
RecalcEngine engine = new RecalcEngine(config); RecalcEngine engine = new RecalcEngine(config);
RuntimeConfig rc = new RuntimeConfig().AddRuntimeContext(new TestConnectorRuntimeContext("SQL", client, console: _output)); RuntimeConfig rc = new RuntimeConfig().AddRuntimeContext(new TestConnectorRuntimeContext("SQL", client, console: _output));
// We can't execute a query like this for unknown reasons so we'll have to do it manually
//string query =
// "SELECT fk.name 'FK Name', tp.name 'Parent table', cp.name, tr.name 'Refrenced table', cr.name " +
// "FROM sys.foreign_keys fk " +
// "INNER JOIN sys.tables tp ON fk.parent_object_id = tp.object_id " +
// "INNER JOIN sys.tables tr ON fk.referenced_object_id = tr.object_id " +
// "INNER JOIN sys.foreign_key_columns fkc ON fkc.constraint_object_id = fk.object_id " +
// "INNER JOIN sys.columns cp ON fkc.parent_column_id = cp.column_id AND fkc.parent_object_id = cp.object_id " +
// "INNER JOIN sys.columns cr ON fkc.referenced_column_id = cr.column_id AND fkc.referenced_object_id = cr.object_id " +
// "ORDER BY tp.name, cp.column_id";
// This will return 4 tables in an Untyped Object
string query = string query =
"select name, object_id, parent_object_id, referenced_object_id from sys.foreign_keys; " + "SELECT fk.name AS FK_Name, '[' + sp.name + '].[' + tp.name + ']' AS Parent_Table, cp.name AS Parent_Column, '[' + sr.name + '].[' + tr.name + ']' AS Referenced_Table, cr.name AS Referenced_Column" +
"select object_id, name from sys.tables; " + @" FROM sys.foreign_keys fk" +
"select constraint_object_id, parent_column_id, parent_object_id, referenced_column_id, referenced_object_id from sys.foreign_key_columns; " + @" INNER JOIN sys.tables tp ON fk.parent_object_id = tp.object_id" +
"select name, object_id, column_id from sys.columns"; @" INNER JOIN sys.tables tr ON fk.referenced_object_id = tr.object_id" +
@" INNER JOIN sys.schemas sp on tp.schema_id = sp.schema_id" +
@" INNER JOIN sys.schemas sr on tr.schema_id = sr.schema_id" +
@" INNER JOIN sys.foreign_key_columns fkc ON fkc.constraint_object_id = fk.object_id" +
@" INNER JOIN sys.columns cp ON fkc.parent_column_id = cp.column_id AND fkc.parent_object_id = cp.object_id" +
@" INNER JOIN sys.columns cr ON fkc.referenced_column_id = cr.column_id AND fkc.referenced_object_id = cr.object_id" +
@" WHERE '[' + sp.name + '].[' + tp.name + ']' = '[SalesLT].[Product]'";
testConnector.SetResponseFromFile(@"Responses\SQL GetRelationships SampleDB.json"); testConnector.SetResponseFromFile(@"Responses\SQL GetRelationships SampleDB.json");
var result = await engine.EvalAsync(@$"SQL.ExecutePassThroughNativeQueryV2(""pfxdev-sql.database.windows.net"", ""SampleDB"", {{ query: ""{query}"" }})", CancellationToken.None, new ParserOptions() { AllowsSideEffects = true }, runtimeConfig: rc); var result = await engine.EvalAsync(@$"SQL.ExecutePassThroughNativeQueryV2(""pfxdev-sql.database.windows.net"", ""SampleDB"", {{ query: ""{query}"" }})", CancellationToken.None, new ParserOptions() { AllowsSideEffects = true }, runtimeConfig: rc);
@ -1414,73 +1409,40 @@ namespace Microsoft.PowerFx.Tests
JsonUntypedObject juo = Assert.IsType<JsonUntypedObject>(uov.Impl); JsonUntypedObject juo = Assert.IsType<JsonUntypedObject>(uov.Impl);
JsonElement je = juo._element; JsonElement je = juo._element;
Result r = je.Deserialize<Result>(); RelationshipResult r = je.Deserialize<RelationshipResult>();
var relationships = r.ResultSets.Table1;
SqlForeignKey[] fkt = r.ResultSets.Table1;
SqlTable[] tt = r.ResultSets.Table2;
SqlForeignKeyColumn[] fkct = r.ResultSets.Table3;
SqlColumn[] ct = r.ResultSets.Table4;
List<SqlRelationship> sqlRelationShips = new List<SqlRelationship>(); List<SqlRelationship> sqlRelationShips = new List<SqlRelationship>();
foreach (SqlForeignKey fk in fkt) foreach (var fk in relationships)
{ {
foreach (SqlTable tp in tt.Where(tp => fk.parent_object_id == tp.object_id)) sqlRelationShips.Add(new SqlRelationship()
{ {
foreach (SqlTable tr in tt.Where(tr => fk.referenced_object_id == tr.object_id)) RelationshipName = fk.FK_Name,
{ ParentTable = fk.Parent_Table,
foreach (SqlForeignKeyColumn fkc in fkct.Where(fkc => fkc.constraint_object_id == fk.object_id)) ColumnName = fk.Parent_Column,
{ ReferencedTable = fk.Referenced_Table,
foreach (SqlColumn cp in ct.Where(cp => fkc.parent_column_id == cp.column_id && fkc.parent_object_id == cp.object_id)) ReferencedColumnName = fk.Referenced_Column
{ });
foreach (SqlColumn cr in ct.Where(cr => fkc.referenced_column_id == cr.column_id && fkc.referenced_object_id == cr.object_id))
{
sqlRelationShips.Add(new SqlRelationship()
{
RelationshipName = fk.name,
ParentTable = tp.name,
ColumnName = cp.name,
ReferencedTable = tr.name,
ReferencedColumnName = cr.name,
ColumnId = cp.column_id
});
}
}
}
}
}
} }
sqlRelationShips = sqlRelationShips.OrderBy(sr => sr.ParentTable).ThenBy(sr => sr.ColumnId).ToList(); Assert.Equal(2, sqlRelationShips.Count);
Assert.Equal("FK_Product_ProductModel_ProductModelID, [SalesLT].[Product], ProductModelID, [SalesLT].[ProductModel], ProductModelID", sqlRelationShips[0].ToString());
Assert.Equal("FK_Product_ProductCategory_ProductCategoryID, [SalesLT].[Product], ProductCategoryID, [SalesLT].[ProductCategory], ProductCategoryID", sqlRelationShips[1].ToString());
Assert.Equal(12, sqlRelationShips.Count); string expected = @$"POST https://4d4a8e81-17a4-4a92-9bfe-8d12e607fb7f.08.common.tip1.azure-apihub.net/invoke
Assert.Equal("FK_CustomerAddress_Customer_CustomerID, CustomerAddress, CustomerID, Customer, CustomerID", sqlRelationShips[0].ToString()); authority: 4d4a8e81-17a4-4a92-9bfe-8d12e607fb7f.08.common.tip1.azure-apihub.net
Assert.Equal("FK_CustomerAddress_Address_AddressID, CustomerAddress, AddressID, Address, AddressID", sqlRelationShips[1].ToString());
Assert.Equal("FK_Product_ProductCategory_ProductCategoryID, Product, ProductCategoryID, ProductCategory, ProductCategoryID", sqlRelationShips[2].ToString());
Assert.Equal("FK_Product_ProductModel_ProductModelID, Product, ProductModelID, ProductModel, ProductModelID", sqlRelationShips[3].ToString());
Assert.Equal("FK_ProductCategory_ProductCategory_ParentProductCategoryID_ProductCategoryID, ProductCategory, ParentProductCategoryID, ProductCategory, ProductCategoryID", sqlRelationShips[4].ToString());
Assert.Equal("FK_ProductModelProductDescription_ProductModel_ProductModelID, ProductModelProductDescription, ProductModelID, ProductModel, ProductModelID", sqlRelationShips[5].ToString());
Assert.Equal("FK_ProductModelProductDescription_ProductDescription_ProductDescriptionID, ProductModelProductDescription, ProductDescriptionID, ProductDescription, ProductDescriptionID", sqlRelationShips[6].ToString());
Assert.Equal("FK_SalesOrderDetail_SalesOrderHeader_SalesOrderID, SalesOrderDetail, SalesOrderID, SalesOrderHeader, SalesOrderID", sqlRelationShips[7].ToString());
Assert.Equal("FK_SalesOrderDetail_Product_ProductID, SalesOrderDetail, ProductID, Product, ProductID", sqlRelationShips[8].ToString());
Assert.Equal("FK_SalesOrderHeader_Customer_CustomerID, SalesOrderHeader, CustomerID, Customer, CustomerID", sqlRelationShips[9].ToString());
Assert.Equal("FK_SalesOrderHeader_Address_ShipTo_AddressID, SalesOrderHeader, ShipToAddressID, Address, AddressID", sqlRelationShips[10].ToString());
Assert.Equal("FK_SalesOrderHeader_Address_BillTo_AddressID, SalesOrderHeader, BillToAddressID, Address, AddressID", sqlRelationShips[11].ToString());
string expected = @$"POST https://firstrelease-003.azure-apihub.net/invoke
authority: firstrelease-003.azure-apihub.net
Authorization: Bearer {jwt} Authorization: Bearer {jwt}
path: /invoke path: /invoke
scheme: https scheme: https
x-ms-client-environment-id: /providers/Microsoft.PowerApps/environments/49970107-0806-e5a7-be5e-7c60e2750f01 x-ms-client-environment-id: /providers/Microsoft.PowerApps/environments/4d4a8e81-17a4-4a92-9bfe-8d12e607fb7f
x-ms-client-session-id: 8e67ebdc-d402-455a-b33a-304820832383 x-ms-client-session-id: 8e67ebdc-d402-455a-b33a-304820832383
x-ms-request-method: POST x-ms-request-method: POST
x-ms-request-url: /apim/sql/29941b77eb0a40fe925cd7a03cb85b40/v2/datasets/pfxdev-sql.database.windows.net,SampleDB/query/sql x-ms-request-url: /apim/sql/53f515b50c3e4925803ec1f0945e799f/v2/datasets/pfxdev-sql.database.windows.net,SampleDB/query/sql
x-ms-user-agent: PowerFx/{PowerPlatformConnectorClient.Version} x-ms-user-agent: PowerFx/{PowerPlatformConnectorClient.Version}
[content-header] Content-Type: application/json; charset=utf-8 [content-header] Content-Type: application/json; charset=utf-8
[body] {{""query"":""select name, object_id, parent_object_id, referenced_object_id from sys.foreign_keys; select object_id, name from sys.tables; select constraint_object_id, parent_column_id, parent_object_id, referenced_column_id, referenced_object_id from sys.foreign_key_columns; select name, object_id, column_id from sys.columns""}} [body] {{""query"":""SELECT fk.name AS FK_Name, \u0027[\u0027 \u002B sp.name \u002B \u0027].[\u0027 \u002B tp.name \u002B \u0027]\u0027 AS Parent_Table, cp.name AS Parent_Column, \u0027[\u0027 \u002B sr.name \u002B \u0027].[\u0027 \u002B tr.name \u002B \u0027]\u0027 AS Referenced_Table, cr.name AS Referenced_Column FROM sys.foreign_keys fk INNER JOIN sys.tables tp ON fk.parent_object_id = tp.object_id INNER JOIN sys.tables tr ON fk.referenced_object_id = tr.object_id INNER JOIN sys.schemas sp on tp.schema_id = sp.schema_id INNER JOIN sys.schemas sr on tr.schema_id = sr.schema_id INNER JOIN sys.foreign_key_columns fkc ON fkc.constraint_object_id = fk.object_id INNER JOIN sys.columns cp ON fkc.parent_column_id = cp.column_id AND fkc.parent_object_id = cp.object_id INNER JOIN sys.columns cr ON fkc.referenced_column_id = cr.column_id AND fkc.referenced_object_id = cr.object_id WHERE \u0027[\u0027 \u002B sp.name \u002B \u0027].[\u0027 \u002B tp.name \u002B \u0027]\u0027 = \u0027[SalesLT].[Product]\u0027""}}
"; ";
Assert.Equal(expected, testConnector._log.ToString()); Assert.Equal(expected, testConnector._log.ToString());
} }
@ -1494,51 +1456,30 @@ namespace Microsoft.PowerFx.Tests
public string ColumnName; public string ColumnName;
public string ReferencedTable; public string ReferencedTable;
public string ReferencedColumnName; public string ReferencedColumnName;
public long ColumnId;
public override string ToString() => $"{RelationshipName}, {ParentTable}, {ColumnName}, {ReferencedTable}, {ReferencedColumnName}"; public override string ToString() => $"{RelationshipName}, {ParentTable}, {ColumnName}, {ReferencedTable}, {ReferencedColumnName}";
} }
public class Result internal class RelationshipResult
{ {
public ResultSets ResultSets { get; set; } public RelationshipResultSets ResultSets { get; set; }
} }
public class ResultSets internal class RelationshipResultSets
{ {
public SqlForeignKey[] Table1 { get; set; } public FKRelationship[] Table1 { get; set; }
public SqlTable[] Table2 { get; set; }
public SqlForeignKeyColumn[] Table3 { get; set; }
public SqlColumn[] Table4 { get; set; }
} }
public class SqlForeignKey internal class FKRelationship
{ {
public string name { get; set; } public string FK_Name { get; set; }
public long object_id { get; set; }
public long parent_object_id { get; set; }
public long referenced_object_id { get; set; }
}
public class SqlTable public string Parent_Table { get; set; }
{
public long object_id { get; set; }
public string name { get; set; }
}
public class SqlForeignKeyColumn public string Parent_Column { get; set; }
{
public long constraint_object_id { get; set; }
public long parent_column_id { get; set; }
public long parent_object_id { get; set; }
public long referenced_column_id { get; set; }
public long referenced_object_id { get; set; }
}
public class SqlColumn public string Referenced_Table { get; set; }
{
public string name { get; set; } public string Referenced_Column { get; set; }
public long object_id { get; set; }
public long column_id { get; set; }
} }
#pragma warning restore SA1516 #pragma warning restore SA1516
@ -1616,7 +1557,7 @@ namespace Microsoft.PowerFx.Tests
config.AddActionConnector("SQL", apiDoc, new ConsoleLogger(_output)); config.AddActionConnector("SQL", apiDoc, new ConsoleLogger(_output));
var engine = new RecalcEngine(config); var engine = new RecalcEngine(config);
RuntimeConfig rc = new RuntimeConfig(); RuntimeConfig rc = new RuntimeConfig();
rc.SetTimeZone(TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time")); rc.SetTimeZone(TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time"));
rc.AddRuntimeContext(new TestConnectorRuntimeContext("SQL", client, console: _output)); rc.AddRuntimeContext(new TestConnectorRuntimeContext("SQL", client, console: _output));

2
src/tests/Microsoft.PowerFx.Connectors.Tests.Shared/PowerPlatformTabularTests.cs
Просмотреть файл

@ -249,7 +249,7 @@ namespace Microsoft.PowerFx.Connectors.Tests
bool b = sqlTable.TabularRecordType.TryGetFieldExternalTableName("ProductModelID", out string externalTableName, out string foreignKey); bool b = sqlTable.TabularRecordType.TryGetFieldExternalTableName("ProductModelID", out string externalTableName, out string foreignKey);
Assert.True(b); Assert.True(b);
Assert.Equal("ProductModel", externalTableName); // Display Name Assert.Equal("[SalesLT].[ProductModel]", externalTableName); // Logical Name
Assert.Equal("ProductModelID", foreignKey); Assert.Equal("ProductModelID", foreignKey);
testConnector.SetResponseFromFiles(@"Responses\SQL GetSchema ProductModel.json", @"Responses\SQL GetRelationships SampleDB.json"); testConnector.SetResponseFromFiles(@"Responses\SQL GetSchema ProductModel.json", @"Responses\SQL GetRelationships SampleDB.json");

7319
src/tests/Microsoft.PowerFx.Connectors.Tests.Shared/Responses/SQL GetRelationships SampleDB.json
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу