fix main build

Author: akvlad

.github/workflows/MainDistributionPipeline.yml

@@ -15,13 +15,14 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  duckdb-next-build:
-    name: Build extension binaries (next)
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
-    with:
-      duckdb_version: main
-      ci_tools_version: main
-      extension_name: chsql
+#  Temporarily disabled because main is broken
+#  duckdb-next-build:
+#    name: Build extension binaries (next)
+#    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
+#    with:
+#      duckdb_version: 1.1.2
+#      ci_tools_version: 1.1.2
+#      extension_name: chsql
 
   duckdb-stable-build:
     name: Build extension binaries

chsql/CMakeLists.txt

@@ -7,6 +7,7 @@ set(TARGET_NAME chsql)
 find_package(OpenSSL REQUIRED)
 set(EXTENSION_NAME ${TARGET_NAME}_extension)
 set(LOADABLE_EXTENSION_NAME ${TARGET_NAME}_loadable_extension)
+set(CHSQL_DUCKDB_VERSION ${DUCKDB_MAJOR_VERSION})
 project(${TARGET_NAME})
 
 include_directories(

chsql/extension_config.cmake

@@ -1,5 +1,5 @@
 # This file is included by DuckDB's build system. It specifies which extension to load
-
+set(CHSQL_DUCKDB_VERSION ${DUCKDB_MAJOR_VERSION})
 include_directories(
         ./src/include
         ${CMAKE_CURRENT_SOURCE_DIR}/../duckdb/extension/parquet/include

chsql/src/include/chsql_parquet_types.h

@@ -5,6 +5,7 @@
 #ifndef PARQUET_TYPES_H
 #define PARQUET_TYPES_H
 
+
 #include "duckdb.hpp"
 #include <parquet_types.h>
 

chsql/src/parquet_ordered_scan.cpp

@@ -37,9 +37,9 @@ namespace duckdb {
                 }
 				columnMap.push_back(schema_column - reader->metadata->metadata->schema.begin() - 1);
 				reader->reader_data.column_ids.push_back(
-					MultiFileLocalColumnId(schema_column - reader->metadata->metadata->schema.begin() - 1));
+					schema_column - reader->metadata->metadata->schema.begin() - 1);
 				reader->reader_data.column_mapping.push_back(
-					MultiFileGlobalIndex(it - returnCols.begin()));
+					it - returnCols.begin());
 			}
 			auto order_by_column_it = find_if(
 				reader->metadata->metadata->schema.begin(),
@@ -53,7 +53,7 @@ namespace duckdb {
 		}
 		void Scan(ClientContext& ctx) {
 			chunk->Reset();
-			reader->Scan(ctx, *scanState, *chunk);
+			reader->Scan(*scanState, *chunk);
 			if (!haveAbsentColumns || chunk->size() == 0) {
 				return;
 			}