duckdb 1.1.4-dev2.0 → 1.1.4-dev9.0

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/rbtz.h

@@ -76,7 +76,7 @@ public:
       *semantically equal.
      * @stable ICU 3.8
      */
-    virtual UBool operator==(const TimeZone& that) const;
+    virtual bool operator==(const TimeZone& that) const;
 
     /**
      * Return true if the given <code>TimeZone</code> objects are
@@ -86,7 +86,7 @@ public:
      * semantically unequal.
      * @stable ICU 3.8
      */
-    virtual UBool operator!=(const TimeZone& that) const;
+    virtual bool operator!=(const TimeZone& that) const;
 
     /**
      * Adds the <code>TimeZoneRule</code> which represents time transitions.

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/region.h

@@ -81,13 +81,13 @@ public:
      * Returns true if the two regions are equal.
      * @stable ICU 51
      */
-    UBool operator==(const Region &that) const;
+    bool operator==(const Region &that) const;
 
     /**
      * Returns true if the two regions are NOT equal; that is, if operator ==() returns false.
      * @stable ICU 51
      */
-    UBool operator!=(const Region &that) const;
+    bool operator!=(const Region &that) const;
  
     /**
      * Returns a pointer to a Region using the given region code.  The region code can be either 2-letter ISO code,

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/search.h

@@ -272,7 +272,7 @@
 //      *         attributes. FALSE otherwise.
 //      * @stable ICU 2.0
 //      */
-//     virtual UBool operator==(const SearchIterator &that) const;
+//     virtual bool operator==(const SearchIterator &that) const;
 
 //     /**
 //      * Not-equal operator.
@@ -280,7 +280,7 @@
 //      * @return FALSE if operator== returns TRUE, and vice versa.
 //      * @stable ICU 2.0
 //      */
-//     UBool operator!=(const SearchIterator &that) const;
+//     bool operator!=(const SearchIterator &that) const;
 
 //     // public methods ----------------------------------------------------
 

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/selfmt.h

@@ -259,7 +259,7 @@ public:
      * @return         true if other is semantically equal to this.
      * @stable ICU 4.4
      */
-    virtual UBool operator==(const Format& other) const;
+    virtual bool operator==(const Format& other) const;
 
     /**
      * Return true if another object is semantically unequal to this one.
@@ -268,7 +268,7 @@ public:
      * @return         true if other is semantically unequal to this.
      * @stable ICU 4.4
      */
-    virtual UBool operator!=(const Format& other) const;
+    virtual bool operator!=(const Format& other) const;
 
     /**
      * Clones this Format object polymorphically.  The caller owns the

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/simpletz.h

@@ -111,7 +111,7 @@ public:
      *              otherwise.
      * @stable ICU 2.0
      */
-    virtual UBool operator==(const TimeZone& that) const;
+    virtual bool operator==(const TimeZone& that) const;
 
     /**
      * Constructs a SimpleTimeZone with the given raw GMT offset and time zone ID,

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/smpdtfmt.h

@@ -876,7 +876,7 @@ public:
      * @return         true if the given Format objects are semantically equal.
      * @stable ICU 2.0
      */
-    virtual UBool operator==(const Format& other) const;
+    virtual bool operator==(const Format& other) const;
 
 
     using DateFormat::format;

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/sortkey.h

@@ -145,7 +145,7 @@ public:
     * @return Returns true if two collation keys are equal, false otherwise.
     * @stable ICU 2.0
     */
-    UBool                   operator==(const CollationKey& source) const;
+    bool                   operator==(const CollationKey& source) const;
 
     /**
     * Compare if two collation keys are not the same.
@@ -153,7 +153,7 @@ public:
     * @return Returns TRUE if two collation keys are different, FALSE otherwise.
     * @stable ICU 2.0
     */
-    UBool                   operator!=(const CollationKey& source) const;
+    bool                   operator!=(const CollationKey& source) const;
 
 
     /**
@@ -316,7 +316,7 @@ private:
     } fUnion;
 };
 
-inline UBool
+inline bool
 CollationKey::operator!=(const CollationKey& other) const
 {
     return !(*this == other);

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/stsearch.h

@@ -297,7 +297,7 @@
 //      *         while looking for the same pattern.
 //      * @stable ICU 2.0
 //      */
-//     virtual UBool operator==(const SearchIterator &that) const;
+//     virtual bool operator==(const SearchIterator &that) const;
 
 //     // public get and set methods ----------------------------------------
 

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/tblcoll.h

@@ -223,7 +223,7 @@ public:
      * @return true if arguments is the same as this object.
      * @stable ICU 2.0
      */
-    virtual UBool operator==(const Collator& other) const;
+    virtual bool operator==(const Collator& other) const;
 
     /**
      * Makes a copy of this object.

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/timezone.h

@@ -445,7 +445,7 @@ public:
      *              otherwise.
      * @stable ICU 2.0
      */
-    virtual UBool operator==(const TimeZone& that) const;
+    virtual bool operator==(const TimeZone& that) const;
 
     /**
      * Returns true if the two TimeZones are NOT equal; that is, if operator==() returns
@@ -456,7 +456,7 @@ public:
      *              otherwise.
      * @stable ICU 2.0
      */
-    UBool operator!=(const TimeZone& that) const {return !operator==(that);}
+    bool operator!=(const TimeZone& that) const {return !operator==(that);}
 
     /**
      * Returns the TimeZone's adjusted GMT offset (i.e., the number of milliseconds to add

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/tmutamt.h

@@ -103,7 +103,7 @@ public:
      * @return       true if this object is equal to the given object.
      * @stable ICU 4.2
      */
-    virtual UBool operator==(const UObject& other) const;
+    virtual bool operator==(const UObject& other) const;
 
 
     /** 
@@ -112,7 +112,7 @@ public:
      * @return       true if this object is not equal to the given object.
      * @stable ICU 4.2
      */
-    UBool operator!=(const UObject& other) const;
+    bool operator!=(const UObject& other) const;
 
 
     /**
@@ -160,7 +160,7 @@ public:
 
 
 
-inline UBool 
+inline bool
 TimeUnitAmount::operator!=(const UObject& other) const {
     return !operator==(other);
 }

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/tmutfmt.h

@@ -141,7 +141,7 @@ public:
      * @return      true if the given Format objects are not semantically equal.
      * @deprecated ICU 53
      */
-    UBool operator!=(const Format& other) const;
+    bool operator!=(const Format& other) const;
 
     /**
      * Set the locale used for formatting or parsing.
@@ -236,7 +236,7 @@ private:
     friend struct TimeUnitFormatReadSink;
 };
 
-inline UBool
+inline bool
 TimeUnitFormat::operator!=(const Format& other) const  {
     return !operator==(other);
 }

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/tzfmt.h

@@ -299,7 +299,7 @@ public:
      *                Objects of different subclasses are considered unequal.
      * @stable ICU 50
      */
-    virtual UBool operator==(const Format& other) const;
+    virtual bool operator==(const Format& other) const;
 
     /**
      * Clone this object polymorphically. The caller is responsible

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/tznames.h

@@ -142,7 +142,7 @@ public:
      * @return Return TRUE if the given Format objects are semantically equal.
      * @stable ICU 50
      */
-    virtual UBool operator==(const TimeZoneNames& other) const = 0;
+    virtual bool operator==(const TimeZoneNames& other) const = 0;
 
     /**
      * Return true if the given TimeZoneNames objects are not semantically
@@ -151,7 +151,7 @@ public:
      * @return Return TRUE if the given Format objects are not semantically equal.
      * @stable ICU 50
      */
-    UBool operator!=(const TimeZoneNames& other) const { return !operator==(other); }
+    bool operator!=(const TimeZoneNames& other) const { return !operator==(other); }
 
     /**
      * Clone this object polymorphically.  The caller is responsible

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/tzrule.h

@@ -56,7 +56,7 @@ public:
      * @return  true if the given <code>TimeZoneRule</code> objects are semantically equal.
      * @stable ICU 3.8
      */
-    virtual UBool operator==(const TimeZoneRule& that) const;
+    virtual bool operator==(const TimeZoneRule& that) const;
 
     /**
      * Return true if the given <code>TimeZoneRule</code> objects are semantically unequal. Objects
@@ -65,7 +65,7 @@ public:
      * @return  true if the given <code>TimeZoneRule</code> objects are semantically unequal.
      * @stable ICU 3.8
      */
-    virtual UBool operator!=(const TimeZoneRule& that) const;
+    virtual bool operator!=(const TimeZoneRule& that) const;
 
     /**
      * Fills in "name" with the name of this time zone.
@@ -247,7 +247,7 @@ public:
      * @return  true if the given <code>TimeZoneRule</code> objects are semantically equal.
      * @stable ICU 3.8
      */
-    virtual UBool operator==(const TimeZoneRule& that) const;
+    virtual bool operator==(const TimeZoneRule& that) const;
 
     /**
      * Return true if the given <code>TimeZoneRule</code> objects are semantically unequal. Objects
@@ -256,7 +256,7 @@ public:
      * @return  true if the given <code>TimeZoneRule</code> objects are semantically unequal.
      * @stable ICU 3.8
      */
-    virtual UBool operator!=(const TimeZoneRule& that) const;
+    virtual bool operator!=(const TimeZoneRule& that) const;
 
     /**
      * Gets the time when this rule takes effect in the given year.
@@ -458,7 +458,7 @@ public:
      * @return  true if the given <code>TimeZoneRule</code> objects are semantically equal.
      * @stable ICU 3.8
      */
-    virtual UBool operator==(const TimeZoneRule& that) const;
+    virtual bool operator==(const TimeZoneRule& that) const;
 
     /**
      * Return true if the given <code>TimeZoneRule</code> objects are semantically unequal. Objects
@@ -467,7 +467,7 @@ public:
      * @return  true if the given <code>TimeZoneRule</code> objects are semantically unequal.
      * @stable ICU 3.8
      */
-    virtual UBool operator!=(const TimeZoneRule& that) const;
+    virtual bool operator!=(const TimeZoneRule& that) const;
 
     /**
      * Gets the start date/time rule used by this rule.
@@ -674,7 +674,7 @@ public:
      * @return  true if the given <code>TimeZoneRule</code> objects are semantically equal.
      * @stable ICU 3.8
      */
-    virtual UBool operator==(const TimeZoneRule& that) const;
+    virtual bool operator==(const TimeZoneRule& that) const;
 
     /**
      * Return true if the given <code>TimeZoneRule</code> objects are semantically unequal. Objects
@@ -683,7 +683,7 @@ public:
      * @return  true if the given <code>TimeZoneRule</code> objects are semantically unequal.
      * @stable ICU 3.8
      */
-    virtual UBool operator!=(const TimeZoneRule& that) const;
+    virtual bool operator!=(const TimeZoneRule& that) const;
 
     /**
      * Gets the time type of the start times used by this rule.  The return value

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/tztrans.h

@@ -86,7 +86,7 @@ public:
      * @return  true if the given TimeZoneTransition objects are semantically equal.
      * @stable ICU 3.8
      */
-    UBool operator==(const TimeZoneTransition& that) const;
+    bool operator==(const TimeZoneTransition& that) const;
 
     /**
      * Return true if the given TimeZoneTransition objects are semantically unequal. Objects
@@ -95,7 +95,7 @@ public:
      * @return  true if the given TimeZoneTransition objects are semantically unequal.
      * @stable ICU 3.8
      */
-    UBool operator!=(const TimeZoneTransition& that) const;
+    bool operator!=(const TimeZoneTransition& that) const;
 
     /**
      * Returns the time of transition in milliseconds.

package/src/duckdb/extension/icu/third_party/icu/i18n/unicode/vtzone.h

@@ -72,7 +72,7 @@ public:
       *semantically equal.
      * @stable ICU 3.8
      */
-    virtual UBool operator==(const TimeZone& that) const;
+    virtual bool operator==(const TimeZone& that) const;
 
     /**
      * Return true if the given <code>TimeZone</code> objects are
@@ -82,7 +82,7 @@ public:
      * semantically unequal.
      * @stable ICU 3.8
      */
-    virtual UBool operator!=(const TimeZone& that) const;
+    virtual bool operator!=(const TimeZone& that) const;
 
     /**
      * Create a <code>VTimeZone</code> instance by the time zone ID.

package/src/duckdb/extension/icu/third_party/icu/i18n/utf16collationiterator.cpp

@@ -37,7 +37,7 @@ UTF16CollationIterator::UTF16CollationIterator(const UTF16CollationIterator &oth
 
 UTF16CollationIterator::~UTF16CollationIterator() {}
 
-UBool
+bool
 UTF16CollationIterator::operator==(const CollationIterator &other) const {
     if(!CollationIterator::operator==(other)) { return FALSE; }
     const UTF16CollationIterator &o = static_cast<const UTF16CollationIterator &>(other);
@@ -171,7 +171,7 @@ FCDUTF16CollationIterator::FCDUTF16CollationIterator(const FCDUTF16CollationIter
 
 FCDUTF16CollationIterator::~FCDUTF16CollationIterator() {}
 
-UBool
+bool
 FCDUTF16CollationIterator::operator==(const CollationIterator &other) const {
     // Skip the UTF16CollationIterator and call its parent.
     if(!CollationIterator::operator==(other)) { return FALSE; }

package/src/duckdb/extension/icu/third_party/icu/i18n/utf16collationiterator.h

@@ -42,7 +42,7 @@ public:
 
     virtual ~UTF16CollationIterator();
 
-    virtual UBool operator==(const CollationIterator &other) const;
+    virtual bool operator==(const CollationIterator &other) const;
 
     virtual void resetToOffset(int32_t newOffset);
 
@@ -95,7 +95,7 @@ public:
 
     virtual ~FCDUTF16CollationIterator();
 
-    virtual UBool operator==(const CollationIterator &other) const;
+    virtual bool operator==(const CollationIterator &other) const;
 
     virtual void resetToOffset(int32_t newOffset);
 

package/src/duckdb/extension/icu/third_party/icu/i18n/vtzone.cpp

@@ -1038,7 +1038,7 @@ VTimeZone::operator=(const VTimeZone& right) {
     return *this;
 }
 
-UBool
+bool
 VTimeZone::operator==(const TimeZone& that) const {
     if (this == &that) {
         return TRUE;
@@ -1057,7 +1057,7 @@ VTimeZone::operator==(const TimeZone& that) const {
     return FALSE;
 }
 
-UBool
+bool
 VTimeZone::operator!=(const TimeZone& that) const {
     return !operator==(that);
 }

package/src/duckdb/extension/json/buffered_json_reader.cpp

@@ -35,7 +35,7 @@ void JSONFileHandle::Reset() {
 	requested_reads = 0;
 	actual_reads = 0;
 	last_read_requested = false;
-	if (IsOpen() && CanSeek()) {
+	if (IsOpen() && !file_handle->IsPipe()) {
 		file_handle->Reset();
 	}
 }
@@ -337,6 +337,11 @@ void BufferedJSONReader::ThrowTransformError(idx_t buf_index, idx_t line_or_obje
 	                            error_message);
 }
 
+bool BufferedJSONReader::HasThrown() {
+	lock_guard<mutex> guard(lock);
+	return thrown;
+}
+
 double BufferedJSONReader::GetProgress() const {
 	lock_guard<mutex> guard(lock);
 	if (HasFileHandle()) {

package/src/duckdb/extension/json/include/buffered_json_reader.hpp

@@ -136,6 +136,8 @@ public:
 	void ThrowParseError(idx_t buf_index, idx_t line_or_object_in_buf, yyjson_read_err &err, const string &extra = "");
 	//! Throws a transform error that mentions the file name and line number
 	void ThrowTransformError(idx_t buf_index, idx_t line_or_object_in_buf, const string &error_message);
+	//! Whether this reader has thrown if an error has occurred
+	bool HasThrown();
 
 	//! Scan progress
 	double GetProgress() const;

package/src/duckdb/extension/json/include/json_common.hpp

@@ -89,7 +89,8 @@ using json_key_set_t = unordered_set<JSONKey, JSONKeyHash, JSONKeyEquality>;
 struct JSONCommon {
 public:
 	//! Read/Write flags
-	static constexpr auto READ_FLAG = YYJSON_READ_ALLOW_INF_AND_NAN | YYJSON_READ_ALLOW_TRAILING_COMMAS;
+	static constexpr auto READ_FLAG =
+	    YYJSON_READ_ALLOW_INF_AND_NAN | YYJSON_READ_ALLOW_TRAILING_COMMAS | YYJSON_READ_BIGNUM_AS_RAW;
 	static constexpr auto READ_STOP_FLAG = READ_FLAG | YYJSON_READ_STOP_WHEN_DONE;
 	static constexpr auto READ_INSITU_FLAG = READ_STOP_FLAG | YYJSON_READ_INSITU;
 	static constexpr auto WRITE_FLAG = YYJSON_WRITE_ALLOW_INF_AND_NAN;
@@ -102,6 +103,7 @@ public:
 	static constexpr char const *TYPE_STRING_BIGINT = "BIGINT";
 	static constexpr char const *TYPE_STRING_UBIGINT = "UBIGINT";
 	static constexpr char const *TYPE_STRING_DOUBLE = "DOUBLE";
+	static constexpr char const *TYPE_STRING_HUGEINT = "HUGEINT";
 	static constexpr char const *TYPE_STRING_VARCHAR = "VARCHAR";
 	static constexpr char const *TYPE_STRING_ARRAY = "ARRAY";
 	static constexpr char const *TYPE_STRING_OBJECT = "OBJECT";
@@ -109,23 +111,24 @@ public:
 	static inline const char *ValTypeToString(yyjson_val *val) {
 		switch (yyjson_get_tag(val)) {
 		case YYJSON_TYPE_NULL | YYJSON_SUBTYPE_NONE:
-			return JSONCommon::TYPE_STRING_NULL;
+			return TYPE_STRING_NULL;
 		case YYJSON_TYPE_STR | YYJSON_SUBTYPE_NOESC:
 		case YYJSON_TYPE_STR | YYJSON_SUBTYPE_NONE:
-			return JSONCommon::TYPE_STRING_VARCHAR;
+			return TYPE_STRING_VARCHAR;
 		case YYJSON_TYPE_ARR | YYJSON_SUBTYPE_NONE:
-			return JSONCommon::TYPE_STRING_ARRAY;
+			return TYPE_STRING_ARRAY;
 		case YYJSON_TYPE_OBJ | YYJSON_SUBTYPE_NONE:
-			return JSONCommon::TYPE_STRING_OBJECT;
+			return TYPE_STRING_OBJECT;
 		case YYJSON_TYPE_BOOL | YYJSON_SUBTYPE_TRUE:
 		case YYJSON_TYPE_BOOL | YYJSON_SUBTYPE_FALSE:
-			return JSONCommon::TYPE_STRING_BOOLEAN;
+			return TYPE_STRING_BOOLEAN;
 		case YYJSON_TYPE_NUM | YYJSON_SUBTYPE_UINT:
-			return JSONCommon::TYPE_STRING_UBIGINT;
+			return TYPE_STRING_UBIGINT;
 		case YYJSON_TYPE_NUM | YYJSON_SUBTYPE_SINT:
-			return JSONCommon::TYPE_STRING_BIGINT;
+			return TYPE_STRING_BIGINT;
 		case YYJSON_TYPE_NUM | YYJSON_SUBTYPE_REAL:
-			return JSONCommon::TYPE_STRING_DOUBLE;
+		case YYJSON_TYPE_RAW | YYJSON_SUBTYPE_NONE:
+			return TYPE_STRING_DOUBLE;
 		default:
 			throw InternalException("Unexpected yyjson tag in ValTypeToString");
 		}
@@ -154,6 +157,7 @@ public:
 		case YYJSON_TYPE_NUM | YYJSON_SUBTYPE_SINT:
 			return LogicalTypeId::BIGINT;
 		case YYJSON_TYPE_NUM | YYJSON_SUBTYPE_REAL:
+		case YYJSON_TYPE_RAW | YYJSON_SUBTYPE_NONE:
 			return LogicalTypeId::DOUBLE;
 		default:
 			throw InternalException("Unexpected yyjson tag in ValTypeToLogicalTypeId");
@@ -279,7 +283,7 @@ public:
 	//! Get JSON value using JSON path query (unsafe)
 	static inline yyjson_val *GetUnsafe(yyjson_val *val, const char *ptr, const idx_t &len) {
 		if (len == 0) {
-			return nullptr;
+			return val;
 		}
 		switch (*ptr) {
 		case '/':

package/src/duckdb/extension/json/include/json_scan.hpp

@@ -41,6 +41,19 @@ public:
 };
 
 struct DateFormatMap {
+public:
+	DateFormatMap() {
+	}
+
+	DateFormatMap(DateFormatMap &&other) noexcept {
+		candidate_formats = other.candidate_formats;
+	}
+
+	DateFormatMap &operator=(DateFormatMap &&other) noexcept {
+		candidate_formats = other.candidate_formats;
+		return *this;
+	}
+
 public:
 	void Initialize(const type_id_map_t<vector<const char *>> &format_templates) {
 		for (const auto &entry : format_templates) {
@@ -51,6 +64,12 @@ public:
 		}
 	}
 
+	DateFormatMap Copy() const {
+		DateFormatMap result;
+		result.candidate_formats = candidate_formats;
+		return result;
+	}
+
 	void AddFormat(LogicalTypeId type, const string &format_string) {
 		auto &formats = candidate_formats[type];
 		formats.emplace_back();
@@ -59,25 +78,47 @@ public:
 	}
 
 	bool HasFormats(LogicalTypeId type) const {
+		lock_guard<mutex> guard(lock);
 		return candidate_formats.find(type) != candidate_formats.end();
 	}
 
-	vector<StrpTimeFormat> &GetCandidateFormats(LogicalTypeId type) {
-		D_ASSERT(HasFormats(type));
-		return candidate_formats[type];
+	idx_t NumberOfFormats(LogicalTypeId type) {
+		lock_guard<mutex> guard(lock);
+		return candidate_formats[type].size();
+	}
+
+	bool GetFormatAtIndex(LogicalTypeId type, idx_t index, StrpTimeFormat &format) {
+		lock_guard<mutex> guard(lock);
+		auto &formats = candidate_formats[type];
+		if (index >= formats.size()) {
+			return false;
+		}
+		format = formats[index];
+		return true;
+	}
+
+	void ShrinkFormatsToSize(LogicalTypeId type, idx_t size) {
+		lock_guard<mutex> guard(lock);
+		auto &formats = candidate_formats[type];
+		while (formats.size() > size) {
+			formats.pop_back();
+		}
 	}
 
 	StrpTimeFormat &GetFormat(LogicalTypeId type) {
+		lock_guard<mutex> guard(lock);
 		D_ASSERT(candidate_formats.find(type) != candidate_formats.end());
 		return candidate_formats.find(type)->second.back();
 	}
 
 	const StrpTimeFormat &GetFormat(LogicalTypeId type) const {
+		lock_guard<mutex> guard(lock);
 		D_ASSERT(candidate_formats.find(type) != candidate_formats.end());
 		return candidate_formats.find(type)->second.back();
 	}
 
 private:
+	mutable mutex lock;
 	type_id_map_t<vector<StrpTimeFormat>> candidate_formats;
 };
 
@@ -132,7 +173,7 @@ public:
 	bool convert_strings_to_integers = false;
 	//! If a struct contains more fields than this threshold with at least 80% similar types,
 	//! we infer it as MAP type
-	idx_t map_inference_threshold = 25;
+	idx_t map_inference_threshold = 200;
 
 	//! All column names (in order)
 	vector<string> names;
@@ -179,7 +220,8 @@ public:
 
 	//! Column names that we're actually reading (after projection pushdown)
 	vector<string> names;
-	vector<column_t> column_indices;
+	vector<column_t> column_ids;
+	vector<ColumnIndex> column_indices;
 
 	//! Buffer manager allocator
 	Allocator &allocator;
@@ -309,8 +351,7 @@ public:
 
 	static double ScanProgress(ClientContext &context, const FunctionData *bind_data_p,
 	                           const GlobalTableFunctionState *global_state);
-	static idx_t GetBatchIndex(ClientContext &context, const FunctionData *bind_data_p,
-	                           LocalTableFunctionState *local_state, GlobalTableFunctionState *global_state);
+	static OperatorPartitionData GetPartitionData(ClientContext &context, TableFunctionGetPartitionInput &input);
 	static unique_ptr<NodeStatistics> Cardinality(ClientContext &context, const FunctionData *bind_data);
 	static void ComplexFilterPushdown(ClientContext &context, LogicalGet &get, FunctionData *bind_data_p,
 	                                  vector<unique_ptr<Expression>> &filters);

package/src/duckdb/extension/json/include/json_structure.hpp

@@ -45,7 +45,7 @@ private:
 	                                DateFormatMap &date_format_map);
 	void EliminateCandidateTypes(idx_t vec_count, Vector &string_vector, DateFormatMap &date_format_map);
 	bool EliminateCandidateFormats(idx_t vec_count, Vector &string_vector, const Vector &result_vector,
-	                               vector<StrpTimeFormat> &formats);
+	                               DateFormatMap &date_format_map);
 
 public:
 	unique_ptr<string> key;
@@ -84,6 +84,7 @@ public:
 struct JSONStructure {
 public:
 	static void ExtractStructure(yyjson_val *val, JSONStructureNode &node, bool ignore_errors);
+	static void MergeNodes(JSONStructureNode &merged, const JSONStructureNode &node);
 	static LogicalType StructureToType(ClientContext &context, const JSONStructureNode &node, idx_t max_depth,
 	                                   double field_appearance_threshold, idx_t map_inference_threshold,
 	                                   idx_t depth = 0, const LogicalType &null_type = LogicalType::JSON());

package/src/duckdb/extension/json/include/json_transform.hpp

@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "duckdb/common/column_index.hpp"
+#include "duckdb/common/optional_ptr.hpp"
 #include "duckdb/function/scalar/strftime_format.hpp"
 #include "json_common.hpp"
 
@@ -64,9 +66,10 @@ struct TryParseTimeStamp {
 
 struct JSONTransform {
 	static bool Transform(yyjson_val *vals[], yyjson_alc *alc, Vector &result, const idx_t count,
-	                      JSONTransformOptions &options);
+	                      JSONTransformOptions &options, optional_ptr<const ColumnIndex> column_index);
 	static bool TransformObject(yyjson_val *objects[], yyjson_alc *alc, const idx_t count, const vector<string> &names,
-	                            const vector<Vector *> &result_vectors, JSONTransformOptions &options);
+	                            const vector<Vector *> &result_vectors, JSONTransformOptions &options,
+	                            optional_ptr<const vector<ColumnIndex>> column_indices, bool error_unknown_key);
 	static bool GetStringVector(yyjson_val *vals[], const idx_t count, const LogicalType &target, Vector &string_vector,
 	                            JSONTransformOptions &options);
 };

package/src/duckdb/extension/json/json_functions/copy_json.cpp

@@ -91,7 +91,7 @@ static BoundStatement CopyToJSONPlan(Binder &binder, CopyStatement &stmt) {
 			strftime_children.emplace_back(make_uniq<ConstantExpression>(timestamp_format));
 			column = make_uniq<FunctionExpression>("strftime", std::move(strftime_children));
 		}
-		column->alias = name;
+		column->SetAlias(name);
 		select_list.emplace_back(std::move(column));
 	}