Fix airbyte tests and bump to Multicorn master

Author: gruuya

engine/src/Multicorn

@@ -1,7 +1,3 @@
-import base64
-import json
-import urllib.parse
-from copy import deepcopy
 from typing import TYPE_CHECKING, Any, Dict, Optional
 
 from splitgraph.core.types import Credentials, Params, TableInfo
@@ -103,7 +99,7 @@ def get_server_options(self):
         options: Dict[str, Optional[str]] = {
             "wrapper": "multicorn.sqlalchemyfdw.SqlAlchemyFdw",
             "db_url": self._build_db_url(),
-            "cast_quals": "yes",
+            "cast_quals": "true",
         }
 
         # For some reason, in SQLAlchemy, if this is not passed

splitgraph/ingestion/athena/__init__.py

@@ -546,7 +546,7 @@ def _assert_scd_data(repo):
 def _assert_normalized_data(repo, unique_key=False):
     expected = [
         {
-            "discovery": "2012-11-11T08:06:26Z",
+            "discovery": "2012-11-11T08:06:26.000000Z",
             "friendly": True,
             "binary_data": "YmludHN0AA==",
             "name": "portobello",
@@ -555,10 +555,10 @@ def _assert_normalized_data(repo, unique_key=False):
             "_airbyte_ab_id": mock.ANY,
             "_airbyte_emitted_at": mock.ANY,
             "_airbyte_normalized_at": mock.ANY,
-            "_airbyte_mushrooms_hashid": "e48f260f784baa48a5c4643ef36024af",
+            "_airbyte_mushrooms_hashid": "882da3c55d7481c75a8f8919fc8441e1",
         },
         {
-            "discovery": "2018-03-17T08:06:26Z",
+            "discovery": "2018-03-17T08:06:26.000000Z",
             "friendly": False,
             "binary_data": "AAAxMjMAAA==",
             "name": "deathcap",
@@ -567,7 +567,7 @@ def _assert_normalized_data(repo, unique_key=False):
             "_airbyte_ab_id": mock.ANY,
             "_airbyte_emitted_at": mock.ANY,
             "_airbyte_normalized_at": mock.ANY,
-            "_airbyte_mushrooms_hashid": "5257322455a690592e14baeb4d24069c",
+            "_airbyte_mushrooms_hashid": "7c835aeba7c53e3a13acb6f953820bb6",
         },
     ]
 
@@ -670,7 +670,7 @@ def _assert_raw_data(repo):
             "_airbyte_data": {
                 "name": "portobello",
                 "friendly": True,
-                "discovery": "2012-11-11T08:06:26Z",
+                "discovery": "2012-11-11T08:06:26.000000Z",
                 "binary_data": "YmludHN0AA==",
                 "mushroom_id": 1,
                 "varbinary_data": "fwAAAQ==",
@@ -682,7 +682,7 @@ def _assert_raw_data(repo):
             "_airbyte_data": {
                 "name": "deathcap",
                 "friendly": False,
-                "discovery": "2018-03-17T08:06:26Z",
+                "discovery": "2018-03-17T08:06:26.000000Z",
                 "binary_data": "AAAxMjMAAA==",
                 "mushroom_id": 2,
                 "varbinary_data": "fwAAAQ==",

test/splitgraph/ingestion/test_airbyte.py

@@ -24,7 +24,7 @@ def test_athena_data_source_options():
     assert source.get_server_options() == {
         "db_url": "awsathena+rest://key:secret@athena.eu-west-3.amazonaws.com:443/mydb?s3_staging_dir=s3://athena/results/",
         "wrapper": "multicorn.sqlalchemyfdw.SqlAlchemyFdw",
-        "cast_quals": "yes",
+        "cast_quals": "true",
     }