[Parquet] Implement automatic shredding for VARIANT columns in COPY TO parquet

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -8,38 +8,35 @@ body:
       value: >
         DuckDB has several repositories for different components, please make sure you're raising your issue in the correct one:
 
-          * [Documentation/website](https://github.com/duckdb/duckdb-web/issues/new)
-          * APIs:
-            * [duckdb-java](https://github.com/duckdb/duckdb-java/issues/new)
-            * [duckdb-node](https://github.com/duckdb/duckdb-node/issues/new)
-            * [duckdb-node-neo](https://github.com/duckdb/duckdb-node-neo/issues/new)
-            * [duckdb-odbc](https://github.com/duckdb/duckdb-odbc/issues/new)
-            * [duckdb-python](https://github.com/duckdb/duckdb-python/issues/new)
-            * [duckdb-r](https://github.com/duckdb/duckdb-r/issues/new)
-            * [duckdb-rs](https://github.com/duckdb/duckdb-rs/issues/new)
-            * [duckdb-swift](https://github.com/duckdb/duckdb-swift/issues/new)
-            * [duckdb-wasm](https://github.com/duckdb/duckdb-wasm/issues/new)
-            * [go-duckdb](https://github.com/marcboeker/go-duckdb/issues/new)
+          * [Documentation](https://github.com/duckdb/duckdb-web/issues/new)
+          * Clients:
+          [Go](https://github.com/duckdb/duckdb-go/issues/new),
+          [Java (JDBC)](https://github.com/duckdb/duckdb-java/issues/new),
+          [Node.js](https://github.com/duckdb/duckdb-node-neo/issues/new),
+          [ODBC](https://github.com/duckdb/duckdb-odbc/issues/new),
+          [Python](https://github.com/duckdb/duckdb-python/issues/new),
+          [R](https://github.com/duckdb/duckdb-r/issues/new),
+          [Rust](https://github.com/duckdb/duckdb-rs/issues/new),
+          [WebAssembly (Wasm)](https://github.com/duckdb/duckdb-wasm/issues/new)
           * Extensions:
-            * [AWS extension](https://github.com/duckdb/duckdb-aws/issues/new)
-            * [Azure extension](https://github.com/duckdb/duckdb-azure/issues/new)
-            * [Delta extension](https://github.com/duckdb/duckdb-delta/issues/new)
-            * [Encodings extension](https://github.com/duckdb/duckdb-encodings/issues/new)
-            * [Excel extension](https://github.com/duckdb/duckdb-excel/issues/new)
-            * [fts (full text search) extension](https://github.com/duckdb/duckdb-fts/issues/new)
-            * [httpfs extension](https://github.com/duckdb/duckdb-httpfs/issues/new)
-            * [Iceberg extension](https://github.com/duckdb/duckdb-iceberg/issues/new)
-            * [inet extension](https://github.com/duckdb/duckdb-inet/issues/new)
-            * [MySQL extension](https://github.com/duckdb/duckdb-mysql/issues/new)
-            * [Postgres scanner](https://github.com/duckdb/duckdb-postgres/issues/new)
-            * [Spatial extension](https://github.com/duckdb/duckdb-spatial/issues/new)
-            * [SQLite scanner](https://github.com/duckdb/duckdb-sqlite/issues/new)
-            * [UI](https://github.com/duckdb/duckdb-ui/issues/new)
-            * [VSS extension](https://github.com/duckdb/duckdb-vss/issues/new)
-          * Connectors:
-            * [dbt-duckdb](https://github.com/duckdb/dbt-duckdb)
+          [`aws`](https://github.com/duckdb/duckdb-aws/issues/new),
+          [`azure`](https://github.com/duckdb/duckdb-azure/issues/new),
+          [`delta`](https://github.com/duckdb/duckdb-delta/issues/new),
+          [`ducklake`](https://github.com/duckdb/duckdb-ducklake/issues/new),
+          [`encodings`](https://github.com/duckdb/duckdb-encodings/issues/new),
+          [`excel`](https://github.com/duckdb/duckdb-excel/issues/new),
+          [`fts`](https://github.com/duckdb/duckdb-fts/issues/new),
+          [`httpfs`](https://github.com/duckdb/duckdb-httpfs/issues/new),
+          [`iceberg`](https://github.com/duckdb/duckdb-iceberg/issues/new),
+          [`inet`](https://github.com/duckdb/duckdb-inet/issues/new),
+          [`mysql`](https://github.com/duckdb/duckdb-mysql/issues/new),
+          [`postgres`](https://github.com/duckdb/duckdb-postgres/issues/new),
+          [`spatial`](https://github.com/duckdb/duckdb-spatial/issues/new),
+          [`sqlite`](https://github.com/duckdb/duckdb-sqlite/issues/new),
+          [`ui`](https://github.com/duckdb/duckdb-ui/issues/new),
+          [`vss`](https://github.com/duckdb/duckdb-vss/issues/new)
 
-        If none of the above repositories are applicable, feel free to raise it in this one
+        If the issue occurs in core DuckDB (e.g., a SQL query crashes or returns incorrect results) or if the issue is in the DuckDB command line client, feel free to raise it in this repository.
 
         Please report security vulnerabilities using GitHub's [report vulnerability form](https://github.com/duckdb/duckdb/security/advisories/new).
 

.github/config/extensions/avro.cmake

@@ -2,6 +2,7 @@ if (NOT MINGW)
     duckdb_extension_load(avro
             LOAD_TESTS DONT_LINK
             GIT_URL https://github.com/duckdb/duckdb-avro
-            GIT_TAG 0c97a61781f63f8c5444cf3e0c6881ecbaa9fe13
+            GIT_TAG 7b75062f6345d11c5342c09216a75c57342c2e82
+            APPLY_PATCHES
     )
 endif()

.github/config/extensions/aws.cmake

@@ -2,6 +2,6 @@ if (NOT MINGW AND NOT ${WASM_ENABLED})
     duckdb_extension_load(aws
             ### TODO: re-enable LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb-aws
-            GIT_TAG 812ce80fde0bfa6e4641b6fd798087349a610795
+            GIT_TAG 18803d5e55b9f9f6dda5047d0fdb4f4238b6801d
             )
 endif()

.github/config/extensions/azure.cmake

@@ -2,6 +2,6 @@ if (NOT MINGW AND NOT ${WASM_ENABLED})
     duckdb_extension_load(azure
             LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb-azure
-            GIT_TAG 5e458fcc466d2bc421922b11f4316564e3017800
+            GIT_TAG 0709c0fa1cf67a668b58b1f06ff3e5fc1696e10a
             )
 endif()

.github/config/extensions/ducklake.cmake

@@ -1,5 +1,5 @@
 duckdb_extension_load(ducklake
     DONT_LINK
     GIT_URL https://github.com/duckdb/ducklake
-    GIT_TAG 45788f0a875844ac8fed048c99b87f7f4b1c2ac1
+    GIT_TAG f134ad86f2f6e7cdf4133086c38ecd9c48f1a772
 )

.github/config/extensions/httpfs.cmake

@@ -1,7 +1,7 @@
 duckdb_extension_load(httpfs
     LOAD_TESTS
     GIT_URL https://github.com/duckdb/duckdb-httpfs
-    GIT_TAG 0518838dae609ab8e8ae66960ce982b839754075
-    INCLUDE_DIR src/include
+    GIT_TAG 8356a9017444f54018159718c8017ff7db4ea756
     APPLY_PATCHES
+    INCLUDE_DIR src/include
 )

.github/config/extensions/iceberg.cmake

@@ -4,7 +4,6 @@ IF (NOT WIN32)
 else ()
     set(LOAD_ICEBERG_TESTS "")
 endif()
-
 if (NOT MINGW AND NOT ${WASM_ENABLED})
     duckdb_extension_load(iceberg
 #            ${LOAD_ICEBERG_TESTS} TODO: re-enable once autoloading test is fixed

.github/config/extensions/inet.cmake

@@ -4,4 +4,5 @@ duckdb_extension_load(inet
     GIT_TAG f6a2a14f061d2dfccdb4283800b55fef3fcbb128
     INCLUDE_DIR src/include
     TEST_DIR test/sql
+    APPLY_PATCHES
     )

.github/config/extensions/mysql_scanner.cmake

@@ -3,6 +3,6 @@ if (NOT MINGW AND NOT ${WASM_ENABLED} AND NOT ${MUSL_ENABLED})
             DONT_LINK
             LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb-mysql
-            GIT_TAG 8a32d4e069438585e80494e296e407653aebfed3
+            GIT_TAG c80647b33972c150f0bd0001c35085cefdc82d1e
             )
 endif()

.github/config/extensions/spatial.cmake

@@ -6,5 +6,6 @@ duckdb_extension_load(spatial
     GIT_TAG a6a607fe3a98ef9ad4bed218490b770f725fbc12
     INCLUDE_DIR src/spatial
     TEST_DIR test/sql
+    APPLY_PATCHES
     )
 endif()

.github/config/extensions/sqlite_scanner.cmake

@@ -8,5 +8,5 @@ endif()
 duckdb_extension_load(sqlite_scanner
         ${STATIC_LINK_SQLITE} LOAD_TESTS
         GIT_URL https://github.com/duckdb/duckdb-sqlite
-        GIT_TAG 833e105cbcaa0f6e8d34d334f3b920ce86f6fdf9
+        GIT_TAG 0c93d610af1e1f66292559fcf0f01a93597a98b6
         )

.github/patches/extensions/avro/fix.patch

@@ -0,0 +1,13 @@
+diff --git a/src/field_ids.cpp b/src/field_ids.cpp
+index d197f8d..52fb48c 100644
+--- a/src/field_ids.cpp
++++ b/src/field_ids.cpp
+@@ -5,6 +5,8 @@ namespace duckdb {
+
+ namespace avro {
+
++constexpr const char *FieldID::DUCKDB_FIELD_ID;
++
+ FieldID::FieldID() : set(false) {
+ }
+

.github/patches/extensions/httpfs/fix.patch

@@ -1,157 +1,38 @@
-diff --git a/src/httpfs.cpp b/src/httpfs.cpp
-index 802581e..a11af95 100644
---- a/src/httpfs.cpp
-+++ b/src/httpfs.cpp
-@@ -729,7 +729,7 @@ void HTTPFileHandle::LoadFileInfo() {
- 			return;
- 		} else {
- 			// HEAD request fail, use Range request for another try (read only one byte)
--			if (flags.OpenForReading() && res->status != HTTPStatusCode::NotFound_404) {
-+			if (flags.OpenForReading() && res->status != HTTPStatusCode::NotFound_404 && res->status != HTTPStatusCode::MovedPermanently_301) {
- 				auto range_res = hfs.GetRangeRequest(*this, path, {}, 0, nullptr, 2);
- 				if (range_res->status != HTTPStatusCode::PartialContent_206 &&
- 				    range_res->status != HTTPStatusCode::Accepted_202 && range_res->status != HTTPStatusCode::OK_200) {
-diff --git a/src/httpfs_extension.cpp b/src/httpfs_extension.cpp
-index 79d9923..9070621 100644
---- a/src/httpfs_extension.cpp
-+++ b/src/httpfs_extension.cpp
-@@ -70,7 +70,7 @@ static void LoadInternal(ExtensionLoader &loader) {
- 	config.AddExtensionOption("ca_cert_file", "Path to a custom certificate file for self-signed certificates.",
- 	                          LogicalType::VARCHAR, Value(""));
- 	// Global S3 config
--	config.AddExtensionOption("s3_region", "S3 Region", LogicalType::VARCHAR, Value("us-east-1"));
-+	config.AddExtensionOption("s3_region", "S3 Region", LogicalType::VARCHAR);
- 	config.AddExtensionOption("s3_access_key_id", "S3 Access Key ID", LogicalType::VARCHAR);
- 	config.AddExtensionOption("s3_secret_access_key", "S3 Access Key", LogicalType::VARCHAR);
- 	config.AddExtensionOption("s3_session_token", "S3 Session Token", LogicalType::VARCHAR);
-diff --git a/src/include/s3fs.hpp b/src/include/s3fs.hpp
-index 525e0dd..a7e933e 100644
---- a/src/include/s3fs.hpp
-+++ b/src/include/s3fs.hpp
-@@ -231,7 +231,7 @@ public:
- 		return true;
- 	}
-
--	static string GetS3BadRequestError(S3AuthParams &s3_auth_params);
-+	static string GetS3BadRequestError(S3AuthParams &s3_auth_params, string correct_region = "");
- 	static string GetS3AuthError(S3AuthParams &s3_auth_params);
- 	static string GetGCSAuthError(S3AuthParams &s3_auth_params);
- 	static HTTPException GetS3Error(S3AuthParams &s3_auth_params, const HTTPResponse &response, const string &url);
 diff --git a/src/s3fs.cpp b/src/s3fs.cpp
-index cbdecba..72eddc3 100644
+index 72eddc3..601ecba 100644
 --- a/src/s3fs.cpp
 +++ b/src/s3fs.cpp
-@@ -872,6 +872,7 @@ void S3FileHandle::Initialize(optional_ptr<FileOpener> opener) {
- 		ErrorData error(ex);
- 		bool refreshed_secret = false;
- 		if (error.Type() == ExceptionType::IO || error.Type() == ExceptionType::HTTP) {
-+			// legacy endpoint (no region) returns 400
- 			auto context = opener->TryGetClientContext();
- 			if (context) {
- 				auto transaction = CatalogTransaction::GetSystemCatalogTransaction(*context);
-@@ -887,9 +888,13 @@ void S3FileHandle::Initialize(optional_ptr<FileOpener> opener) {
- 			auto &extra_info = error.ExtraInfo();
- 			auto entry = extra_info.find("status_code");
- 			if (entry != extra_info.end()) {
--				if (entry->second == "400") {
--					// 400: BAD REQUEST
--					auto extra_text = S3FileSystem::GetS3BadRequestError(auth_params);
-+				if (entry->second == "301" || entry->second == "400") {
-+					auto new_region = extra_info.find("header_x-amz-bucket-region");
-+					string correct_region = "";
-+					if (new_region != extra_info.end()) {
-+						correct_region = new_region->second;
-+					}
-+					auto extra_text = S3FileSystem::GetS3BadRequestError(auth_params, correct_region);
- 					throw Exception(error.Type(), error.RawMessage() + extra_text, extra_info);
+@@ -895,7 +895,7 @@ void S3FileHandle::Initialize(optional_ptr<FileOpener> opener) {
+ 						correct_region = new_region->second;
+ 					}
+ 					auto extra_text = S3FileSystem::GetS3BadRequestError(auth_params, correct_region);
+-					throw Exception(error.Type(), error.RawMessage() + extra_text, extra_info);
++					throw Exception(extra_info, error.Type(), error.RawMessage() + extra_text);
  				}
  				if (entry->second == "403") {
-@@ -1138,12 +1143,15 @@ bool S3FileSystem::ListFiles(const string &directory, const std::function<void(c
- 	return true;
- }
-
--string S3FileSystem::GetS3BadRequestError(S3AuthParams &s3_auth_params) {
-+string S3FileSystem::GetS3BadRequestError(S3AuthParams &s3_auth_params, string correct_region) {
- 	string extra_text = "\n\nBad Request - this can be caused by the S3 region being set incorrectly.";
- 	if (s3_auth_params.region.empty()) {
- 		extra_text += "\n* No region is provided.";
- 	} else {
--		extra_text += "\n* Provided region is \"" + s3_auth_params.region + "\"";
-+		extra_text += "\n* Provided region is: \"" + s3_auth_params.region + "\"";
-+	}
-+	if (!correct_region.empty()) {
-+		extra_text += "\n* Correct region is: \"" + correct_region + "\"";
+ 					// 403: FORBIDDEN
+@@ -905,7 +905,7 @@ void S3FileHandle::Initialize(optional_ptr<FileOpener> opener) {
+ 					} else {
+ 						extra_text = S3FileSystem::GetS3AuthError(auth_params);
+ 					}
+-					throw Exception(error.Type(), error.RawMessage() + extra_text, extra_info);
++					throw Exception(extra_info, error.Type(), error.RawMessage() + extra_text);
+ 				}
+ 			}
+ 			throw;
+@@ -941,13 +941,13 @@ bool S3FileSystem::CanHandleFile(const string &fpath) {
+ void S3FileSystem::RemoveFile(const string &path, optional_ptr<FileOpener> opener) {
+ 	auto handle = OpenFile(path, FileFlags::FILE_FLAGS_NULL_IF_NOT_EXISTS, opener);
+ 	if (!handle) {
+-		throw IOException("Could not remove file \"%s\": %s", {{"errno", "404"}}, path, "No such file or directory");
++		throw IOException({{"errno", "404"}}, "Could not remove file \"%s\": %s", path, "No such file or directory");
+ 	}
+
+ 	auto &s3fh = handle->Cast<S3FileHandle>();
+ 	auto res = DeleteRequest(*handle, s3fh.path, {});
+ 	if (res->status != HTTPStatusCode::OK_200 && res->status != HTTPStatusCode::NoContent_204) {
+-		throw IOException("Could not remove file \"%s\": %s", {{"errno", to_string(static_cast<int>(res->status))}},
++		throw IOException({{"errno", to_string(static_cast<int>(res->status))}}, "Could not remove file \"%s\": %s",
+ 		                  path, res->GetError());
  	}
- 	return extra_text;
  }
-diff --git a/test/sql/copy/csv/test_csv_remote.test b/test/sql/copy/csv/test_csv_remote.test
-index 4144082..9e51585 100644
---- a/test/sql/copy/csv/test_csv_remote.test
-+++ b/test/sql/copy/csv/test_csv_remote.test
-@@ -7,15 +7,26 @@ require httpfs
- statement ok
- PRAGMA enable_verification
-
-+# Test load from url with query string
-+query IIIIIIIIIIII
-+FROM sniff_csv('https://github.com/duckdb/duckdb/raw/main/data/csv/customer.csv?v=1')
-+----
-+,	"	(empty)	\n	(empty)	0	0	[{'name': column00, 'type': BIGINT}, {'name': column01, 'type': VARCHAR}, {'name': column02, 'type': BIGINT}, {'name': column03, 'type': BIGINT}, {'name': column04, 'type': BIGINT}, {'name': column05, 'type': BIGINT}, {'name': column06, 'type': BIGINT}, {'name': column07, 'type': VARCHAR}, {'name': column08, 'type': VARCHAR}, {'name': column09, 'type': VARCHAR}, {'name': column10, 'type': VARCHAR}, {'name': column11, 'type': BIGINT}, {'name': column12, 'type': BIGINT}, {'name': column13, 'type': BIGINT}, {'name': column14, 'type': VARCHAR}, {'name': column15, 'type': VARCHAR}, {'name': column16, 'type': VARCHAR}, {'name': column17, 'type': BIGINT}]	NULL	NULL	NULL	FROM read_csv('https://github.com/duckdb/duckdb/raw/main/data/csv/customer.csv?v=1', auto_detect=false, delim=',', quote='"', escape='', new_line='\n', skip=0, comment='', header=false, columns={'column00': 'BIGINT', 'column01': 'VARCHAR', 'column02': 'BIGINT', 'column03': 'BIGINT', 'column04': 'BIGINT', 'column05': 'BIGINT', 'column06': 'BIGINT', 'column07': 'VARCHAR', 'column08': 'VARCHAR', 'column09': 'VARCHAR', 'column10': 'VARCHAR', 'column11': 'BIGINT', 'column12': 'BIGINT', 'column13': 'BIGINT', 'column14': 'VARCHAR', 'column15': 'VARCHAR', 'column16': 'VARCHAR', 'column17': 'BIGINT'});
-+
-+
-+# This test abuses the LOCAL_EXTENSION_REPO env to make sure tests are only run when running extension tests
-+# in duckdb/duckdb. Otherwise you need to pass a data dir when exex
-+
-+require-env LOCAL_EXTENSION_REPO
-
- # regular csv file
- query ITTTIITITTIIII nosort webpagecsv
--SELECT * FROM read_csv_auto('duckdb/data/csv/real/web_page.csv') ORDER BY 1;
-+SELECT * FROM read_csv_auto('data/csv/real/web_page.csv') ORDER BY 1;
- ----
-
- # file with gzip
- query IIIIIIIIIIIIIII nosort lineitemcsv
--SELECT * FROM read_csv_auto('duckdb/data/csv/lineitem1k.tbl.gz') ORDER BY ALL;
-+SELECT * FROM read_csv_auto('data/csv/lineitem1k.tbl.gz') ORDER BY ALL;
- ----
-
- query ITTTIITITTIIII nosort webpagecsv
-@@ -25,10 +36,3 @@ SELECT * FROM read_csv_auto('https://raw.githubusercontent.com/duckdb/duckdb/mai
- query IIIIIIIIIIIIIII nosort lineitemcsv
- select * from read_csv_auto('https://raw.githubusercontent.com/duckdb/duckdb/main/data/csv/lineitem1k.tbl.gz') ORDER BY ALL;
- ----
--
--
--# Test load from url with query string
--query IIIIIIIIIIII
--FROM sniff_csv('https://github.com/duckdb/duckdb/raw/main/data/csv/customer.csv?v=1')
------
--,	"	(empty)	\n	(empty)	0	0	[{'name': column00, 'type': BIGINT}, {'name': column01, 'type': VARCHAR}, {'name': column02, 'type': BIGINT}, {'name': column03, 'type': BIGINT}, {'name': column04, 'type': BIGINT}, {'name': column05, 'type': BIGINT}, {'name': column06, 'type': BIGINT}, {'name': column07, 'type': VARCHAR}, {'name': column08, 'type': VARCHAR}, {'name': column09, 'type': VARCHAR}, {'name': column10, 'type': VARCHAR}, {'name': column11, 'type': BIGINT}, {'name': column12, 'type': BIGINT}, {'name': column13, 'type': BIGINT}, {'name': column14, 'type': VARCHAR}, {'name': column15, 'type': VARCHAR}, {'name': column16, 'type': VARCHAR}, {'name': column17, 'type': BIGINT}]	NULL	NULL	NULL	FROM read_csv('https://github.com/duckdb/duckdb/raw/main/data/csv/customer.csv?v=1', auto_detect=false, delim=',', quote='"', escape='', new_line='\n', skip=0, comment='', header=false, columns={'column00': 'BIGINT', 'column01': 'VARCHAR', 'column02': 'BIGINT', 'column03': 'BIGINT', 'column04': 'BIGINT', 'column05': 'BIGINT', 'column06': 'BIGINT', 'column07': 'VARCHAR', 'column08': 'VARCHAR', 'column09': 'VARCHAR', 'column10': 'VARCHAR', 'column11': 'BIGINT', 'column12': 'BIGINT', 'column13': 'BIGINT', 'column14': 'VARCHAR', 'column15': 'VARCHAR', 'column16': 'VARCHAR', 'column17': 'BIGINT'});
-diff --git a/test/sql/copy/s3/url_encode.test b/test/sql/copy/s3/url_encode.test
-index 66cbd5c..f5a5912 100644
---- a/test/sql/copy/s3/url_encode.test
-+++ b/test/sql/copy/s3/url_encode.test
-@@ -132,12 +132,20 @@ set s3_endpoint='';
- statement error
- SELECT * FROM 's3://test-bucket/whatever.parquet';
- ----
--<REGEX>:.*Unknown error for HTTP HEAD to 'http://test-bucket.s3.eu-west-1.amazonaws.com/whatever.parquet'.*
-+<REGEX>:.*HTTP Error: Unable to connect to URL .*http://test-bucket.s3.eu-west-1.amazonaws.com/whatever.parquet.*: 301 .Moved Permanently..*
-+.*
-+.*Bad Request - this can be caused by the S3 region being set incorrectly.*
-+.*Provided region is: .eu-west-1.*
-+.*Correct region is: .us-east-1.*
-
- statement error
- SELECT * FROM 'r2://test-bucket/whatever.parquet';
- ----
--<REGEX>:.*Unknown error for HTTP HEAD to 'http://test-bucket.s3.eu-west-1.amazonaws.com/whatever.parquet'.*
-+<REGEX>:.*HTTP Error: Unable to connect to URL .*http://test-bucket.s3.eu-west-1.amazonaws.com/whatever.parquet.*: 301 .Moved Permanently..*
-+.*
-+.*Bad Request - this can be caused by the S3 region being set incorrectly.*
-+.*Provided region is: .eu-west-1.*
-+.*Correct region is: .us-east-1.*
-
- statement error
- SELECT * FROM 'gcs://test-bucket/whatever.parquet';

.github/patches/extensions/inet/hugeint_fixes.patch

@@ -0,0 +1,19 @@
+diff --git a/src/inet_functions.cpp b/src/inet_functions.cpp
+index da92a4c..afa7446 100644
+--- a/src/inet_functions.cpp
++++ b/src/inet_functions.cpp
+@@ -185,11 +185,12 @@ static INET_TYPE AddImplementation(INET_TYPE ip, hugeint_t val) {
+   if (val > 0) {
+     address_out =
+         AddOperatorOverflowCheck::Operation<uhugeint_t, uhugeint_t, uhugeint_t>(
+-            address_in, val);
++            address_in, (uhugeint_t)val);
+   } else {
++    // TODO: this is off for when val is the minimal uhugeint_t value
+     address_out =
+         SubtractOperatorOverflowCheck::Operation<uhugeint_t, uhugeint_t,
+-                                                 uhugeint_t>(address_in, -val);
++                                                 uhugeint_t>(address_in, (uhugeint_t)(-val));
+   }
+
+   if (addr_type == IPAddressType::IP_ADDRESS_V4 &&