From 3f3fa1f85f10e643c2e73afb4d2ce7e98491b2d2 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Tue, 30 Nov 2021 18:32:09 -0800
Subject: [PATCH 1/2] Added few small changes to simplify connector developing
 and debugging

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .../src/PowerBIConnector/SqlOdbcPBIConnector.mproj   |  2 ++
 sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq | 12 ++++++++----
 .../PowerBIConnector/SqlOdbcPBIConnector.query.pq    |  5 ++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj
index b2b177c461f..53dff961de6 100644
--- a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj
+++ b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj
@@ -98,6 +98,8 @@
             archiveOut.CreateEntryFromFile(fullPath, filename, CompressionLevel.Optimal);
         }
     }
+
+    File.Copy(OutputFile, Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), @"Documents\Power BI Desktop\Custom Connectors", Path.GetFileName(OutputFile)), true);
 ]]></Code>
     </Task>
   </UsingTask>
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq
index ba10c39e494..0a4bbf09eb4 100644
--- a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq
+++ b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq
@@ -106,8 +106,8 @@ SqlOdbcPBIConnectorImpl = (Server as text) as table =>
             SupportsOdbcTimestampLiterals = true
         ]),
 
-        OdbcDatasource = Odbc.DataSource(ConnectionString & CredentialConnectionString & EncryptedConnectionString, [
-            // Do not view the tables grouped by their schema names.
+        OdbcOptions = [
+             // Do not view the tables grouped by their schema names.
             HierarchicalNavigation = false,
             // Prevents execution of native SQL statements. Extensions should set this to true.
             HideNativeQuery = true,
@@ -129,7 +129,11 @@ SqlOdbcPBIConnectorImpl = (Server as text) as table =>
 
             // Connection string properties used for encrypted connections.
             CredentialConnectionString = EncryptedConnectionString
-        ])
+        ],
+
+        FullConnectionString = Diagnostics.LogValue("Connection String", ConnectionString & CredentialConnectionString & EncryptedConnectionString),
+
+        OdbcDatasource = Odbc.DataSource(FullConnectionString, OdbcOptions)
     in
         OdbcDatasource;
 
@@ -206,7 +210,7 @@ SqlOdbcPBIConnector.Publish = [
     LearnMoreUrl = "https://www.opensearch.org/",
     
     // Disabling direct query due to limited SQL query support
-    SupportsDirectQuery = false,
+    SupportsDirectQuery = true,
 
     SourceImage = SqlOdbcPBIConnector.Icons,
     SourceTypeImage = SqlOdbcPBIConnector.Icons
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq
index bde4c98a34e..51fe5f5aae8 100644
--- a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq
+++ b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq
@@ -4,15 +4,14 @@ section SqlOdbcPBIConnector.UnitTests;
 shared MyExtension.UnitTest =
 [
     // Common variables for all tests
-    Host = "localhost",
-    Port = 9200,
+    Host = "localhost:9200"
 
     facts =
     {        
         Fact("Connection Test",  
              7,                                    
              let
-                Source = SqlOdbcPBIConnector.Contents(Host,Port),
+                Source = SqlOdbcPBIConnector.Contents(Host),
                 no_of_columns = Table.ColumnCount(Source)
              in
                 no_of_columns                

From 6f046dc5f19676460f9b61e230f7ef38da4b5ae6 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Tue, 30 Nov 2021 18:36:22 -0800
Subject: [PATCH 2/2] Typo fix

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq
index 51fe5f5aae8..8ffb05f1fd0 100644
--- a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq
+++ b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq
@@ -4,7 +4,7 @@ section SqlOdbcPBIConnector.UnitTests;
 shared MyExtension.UnitTest =
 [
     // Common variables for all tests
-    Host = "localhost:9200"
+    Host = "localhost:9200",
 
     facts =
     {