git commit --amend

GoogleCloudPlatform · Mar 3, 2022 · 77e69ae · 77e69ae
1 parent f5a3f58
commit 77e69ae
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/data_validation/cli_tools.py b/data_validation/cli_tools.py
@@ -130,14 +130,14 @@
         ],
     ],
     "DB2": [
-        ["host": "Desired DB2 host"],
-        ["port": "Desired DB2 port (50000 if not provided)"],
-        ["user": "Username to connect to"],
-        ["password": "Password for authentication of user"],
-        ["database": "Database in DB2 to connect to"],
-        ["url": "URL link in DB2 to connect to"],
-        ["driver": "Driver link in DB2 to connect to (default ibm_db_sa)"],
-    ]
+        ["host", "Desired DB2 host"],
+        ["port", "Desired DB2 port (50000 if not provided)"],
+        ["user", "Username to connect to"],
+        ["password", "Password for authentication of user"],
+        ["database", "Database in DB2 to connect to"],
+        ["url", "URL link in DB2 to connect to"],
+        ["driver", "Driver link in DB2 to connect to (default ibm_db_sa)"],
+    ],
 }
 
 

diff --git a/data_validation/clients.py b/data_validation/clients.py
@@ -26,12 +26,11 @@
 from ibis.backends.pandas.client import PandasClient
 from ibis.backends.mysql.client import MySQLClient
 from ibis.backends.postgres.client import PostgreSQLClient
-from ibis.backends.DB2.client import DB2Client
 
 import third_party.ibis.ibis_addon.datatypes
 from third_party.ibis.ibis_cloud_spanner.api import connect as spanner_connect
 from third_party.ibis.ibis_impala.api import impala_connect
-from third_party.ibis.ibis_DB2.api import db2_connect
+from third_party.ibis.ibis_DB2.api import connect as db2_connect
 from data_validation import client_info
 from data_validation import consts, exceptions
 

diff --git a/third_party/ibis/ibis_DB2/alchemy.py b/third_party/ibis/ibis_DB2/alchemy.py
@@ -18,7 +18,7 @@
 
 import ibis.expr.datatypes as dt11
 import ibis.expr.datatypes as dts
-import ibis.sql.alchemy as s_al
+import ibis.backends.base_sqlalchemy.alchemy as s_al
 import third_party.ibis.ibis_DB2.expr.datatypes as dt
 
 _ibis_type_to_sqla = {

diff --git a/third_party/ibis/ibis_DB2/api.py b/third_party/ibis/ibis_DB2/api.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ibis.sql.alchemy import to_sqlalchemy
+from ibis.backends.base_sqlalchemy.alchemy import to_sqlalchemy
 from third_party.ibis.ibis_DB2.client import DB2Client
 from third_party.ibis.ibis_DB2.compiler import dialect, rewrites  # noqa: F401
 

diff --git a/third_party/ibis/ibis_DB2/compiler.py b/third_party/ibis/ibis_DB2/compiler.py
@@ -31,11 +31,11 @@
 import ibis.expr.datatypes as dt
 import ibis.expr.operations as ops
 import ibis.expr.types as ir
-import ibis.sql.alchemy as alch
+import ibis.backends.base_sqlalchemy.alchemy as alch
 import third_party.ibis.ibis_DB2.alchemy as db2_alch
 
 # used for literal translate
-from ibis.sql.alchemy import (
+from ibis.backends.base_sqlalchemy.alchemy import (
     _get_sqla_table,
     _variance_reduction,
     fixed_arity,