Skip to content

Commit 84e1b00

Browse files
committed
fix non Windows built
1 parent d6ddb18 commit 84e1b00

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

.github/workflows/MainDistributionPipeline.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ jobs:
1919
duckdb_version: main
2020
ci_tools_version: main
2121
extension_name: msolap
22-
exclude_archs: 'linux_amd64;linux_arm64;linux_amd64_musl;osx_amd64;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
22+
exclude_archs: 'linux_arm64;linux_amd64_musl;osx_amd64;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
2323
skip_tests: true
2424

2525
duckdb-stable-build:
2626
name: Build extension binaries
27-
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.2.1
27+
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.4.0
2828
with:
29-
duckdb_version: v1.2.2
30-
ci_tools_version: v1.2.1
29+
duckdb_version: v1.4.0
30+
ci_tools_version: v1.4.0
3131
extension_name: msolap
32-
exclude_archs: 'linux_amd64;linux_arm64;linux_amd64_musl;osx_amd64;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
32+
exclude_archs: 'linux_arm64;linux_amd64_musl;osx_amd64;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
3333
skip_tests: true
3434

src/include/msolap_extension.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class MsolapExtension{
1818
#ifdef EXT_VERSION_MSOLAP
1919
return EXT_VERSION_MSOLAP;
2020
#else
21-
return "";
21+
return "v0.1.3";
2222
#endif
2323
}
2424
};

src/msolap_extension_nowin.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#define DUCKDB_EXTENSION_MAIN
22

3+
#include "msolap_extension.hpp"
34
#include "duckdb.hpp"
45
#include "duckdb/function/table_function.hpp"
56
#include "duckdb/common/string_util.hpp"
@@ -58,17 +59,22 @@ static void LoadInternal(ExtensionLoader &loader) {
5859
loader.RegisterFunction(msolap_function);
5960
}
6061

62+
void MsolapExtension::Load(ExtensionLoader &loader) {
63+
// Register the MSOLAP dummy function for non-Windows platforms
64+
TableFunction msolap_function("msolap", {LogicalType::VARCHAR, LogicalType::VARCHAR},
65+
MsolapDummyScan, MsolapDummyBind, MsolapDummyInitGlobalState);
66+
67+
CreateTableFunctionInfo msolap_info(msolap_function);
68+
loader.RegisterFunction(msolap_info);
69+
}
6170

62-
static void Load(ExtensionLoader &loader){
63-
LoadInternal(loader);
64-
}
6571

6672
} // namespace duckdb
6773

6874
extern "C" {
6975

7076
DUCKDB_CPP_EXTENSION_ENTRY(msolap,loader) {
71-
Load(loader);
77+
duckdb::MsolapExtension::Load(loader);
7278
}
7379

7480
DUCKDB_EXTENSION_API const char *msolap_version() {

0 commit comments

Comments
 (0)