From 7bcf44cc07ae24e2eebe99df179a6480ab77b27a Mon Sep 17 00:00:00 2001
From: TJ Banghart <tjbanghart@gmail.com>
Date: Thu, 14 Sep 2023 14:07:51 -0700
Subject: [PATCH] Update connector to use Looker JDBC driver

---
 connector/tableau/looker-jdbc/connectionBuilder.js | 14 +++++++++-----
 connector/tableau/looker-jdbc/connectionFields.xml |  2 +-
 .../tableau/looker-jdbc/connectionProperties.js    |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/connector/tableau/looker-jdbc/connectionBuilder.js b/connector/tableau/looker-jdbc/connectionBuilder.js
index e40798aa75b3..d861b3c752e2 100644
--- a/connector/tableau/looker-jdbc/connectionBuilder.js
+++ b/connector/tableau/looker-jdbc/connectionBuilder.js
@@ -18,9 +18,13 @@
  * source. See manifest.xml.
  */
 (function dsbuilder(attr) {
-    var urlBuilder = "jdbc:avatica:remote:url=https://" +
-        attr[connectionHelper.attributeServer] +
-        ":" + attr[connectionHelper.attributePort] +
-	"/jdbc/;serialization=JSON";
-    return [urlBuilder];
+    var urlBuilder = "jdbc:looker:url=https://" +
+      attr[connectionHelper.attributeServer];
+
+    if (attr[connectionHelper.attributePort]) {
+      urlBuilder = urlBuilder + ":" + attr[connectionHelper.attributePort];
+    }
+
+    return [urlBuilder + ";serialization=JSON"];
 })
+
diff --git a/connector/tableau/looker-jdbc/connectionFields.xml b/connector/tableau/looker-jdbc/connectionFields.xml
index 22d2f105e85f..d44f04ba5893 100644
--- a/connector/tableau/looker-jdbc/connectionFields.xml
+++ b/connector/tableau/looker-jdbc/connectionFields.xml
@@ -29,7 +29,7 @@
     </selection-group>
   </field>
 
-  <field name="port" label="Port" value-type="string" category="endpoint" default-value="57198" />
+  <field name="port" label="Port" value-type="string" category="endpoint" optional="true" default-value="" />
 
   <field name="username" label="Username" value-type="string" category="authentication">
     <conditions>
diff --git a/connector/tableau/looker-jdbc/connectionProperties.js b/connector/tableau/looker-jdbc/connectionProperties.js
index e74b97bbd0c4..6aaa956e3939 100644
--- a/connector/tableau/looker-jdbc/connectionProperties.js
+++ b/connector/tableau/looker-jdbc/connectionProperties.js
@@ -26,8 +26,8 @@
     } else if (authAttrValue == "oauth") {
         props["token"] = attr["ACCESSTOKEN"];
     }
-    props["serialization"] = "PROTOBUF";
     props["database"] = ""; // attr[connectionHelper.attributeDatabase];
     props["schema"] = attr[connectionHelper.attributeSchema];
+//    props["verifySSL"] = "false" // Uncomment me for local testing
     return props;
 })