diff --git a/WORKSPACE b/WORKSPACE
index 775b4ff0..ceb8ce46 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -22,7 +22,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "com_google_zetasql",
-    commit = "1aefaa7c62fc7a50def879bb7c4225ec6974b7ef",
+    commit = "f7734531ca96042a9882b8177bb453889441a153",
     remote = "https://github.com/google/zetasql",
     patches = ["@com_github_Matts966_alphasql//bazel:zetasql.patch"],
 )
diff --git a/bazel/zetasql.patch b/bazel/zetasql.patch
index 8b113e36..97430e82 100644
--- a/bazel/zetasql.patch
+++ b/bazel/zetasql.patch
@@ -1,57 +1,49 @@
-diff --git zetasql/analyzer/BUILD zetasql/analyzer/BUILD
-index bd00b17..c00b1ac 100644
 --- zetasql/analyzer/BUILD
 +++ zetasql/analyzer/BUILD
 @@ -14,7 +14,7 @@
  # limitations under the License.
- 
+ #
+
  package(
--    default_visibility = ["//:__subpackages__"],
+-    default_visibility = ["//zetasql/base:zetasql_implementation"],
 +    default_visibility = ["//visibility:public"],
  )
  
  cc_library(
-diff --git zetasql/base/BUILD zetasql/base/BUILD
-index e40b42f..fb0f4b7 100644
+
 --- zetasql/base/BUILD
 +++ zetasql/base/BUILD
 @@ -17,7 +17,7 @@
  licenses(["notice"])  # Apache v2.0
  
  package(
--    default_visibility = ["//:__subpackages__"],
+-    default_visibility = [":zetasql_implementation"],
 +    default_visibility = ["//visibility:public"],
  )
  
  package_group(
-diff --git zetasql/common/BUILD zetasql/common/BUILD
-index 8d523c5..75bd64f 100644
+
 --- zetasql/common/BUILD
 +++ zetasql/common/BUILD
-@@ -14,7 +14,7 @@
+@@ -14,4 +14,4 @@
  # limitations under the License.
  
  package(
--    default_visibility = ["//:__subpackages__"],
+-    default_visibility = ["//zetasql/base:zetasql_implementation"],
 +    default_visibility = ["//visibility:public"],
-     features = ["parse_headers"],
- )
- 
-diff --git zetasql/parser/BUILD zetasql/parser/BUILD
-index 67b5014..8bad1c4 100644
+
 --- zetasql/parser/BUILD
 +++ zetasql/parser/BUILD
 @@ -17,7 +17,7 @@ load("//bazel:bison.bzl", "genyacc")
  load("//bazel:flex.bzl", "genlex")
  
  package(
--    default_visibility = ["//:__subpackages__"],
+-    default_visibility = ["//zetasql/base:zetasql_implementation"],
 +    default_visibility = ["//visibility:public"],
  )
  
  genrule(
-diff --git zetasql/public/simple_catalog.h zetasql/public/simple_catalog.h
-index ffd3b51..15c68dd 100644
+
 --- zetasql/public/simple_catalog.h
 +++ zetasql/public/simple_catalog.h
 @@ -55,6 +55,11 @@ class SimpleTableProto;
@@ -66,15 +58,14 @@ index ffd3b51..15c68dd 100644
   public:
    // Construct a Catalog with catalog name <name>.
    //
-diff --git zetasql/resolved_ast/BUILD zetasql/resolved_ast/BUILD
-index bb3f2b0..c2a49cf 100644
+
 --- zetasql/resolved_ast/BUILD
 +++ zetasql/resolved_ast/BUILD
 @@ -16,7 +16,7 @@
  
  load("//zetasql/resolved_ast:build_rules.bzl", "gen_resolved_ast_files")
  
--package(default_visibility = ["//:__subpackages__"])
+-package(default_visibility = ["//zetasql/base:zetasql_implementation"])
 +package(default_visibility = ["//visibility:public"])
  
  py_binary(