Changeset: 9a71932dd884 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/9a71932dd884 Removed Files: sql/backends/monet5/vaults/json/74_json.sql Modified Files: sql/backends/monet5/vaults/json/CMakeLists.txt sql/backends/monet5/vaults/json/json.c sql/test/nested/Tests/All Branch: nested Log Message:
integrate sql_register call into startup diffs (73 lines): diff --git a/sql/backends/monet5/vaults/json/74_json.sql b/sql/backends/monet5/vaults/json/74_json.sql deleted file mode 100644 --- a/sql/backends/monet5/vaults/json/74_json.sql +++ /dev/null @@ -1,14 +0,0 @@ --- SPDX-License-Identifier: MPL-2.0 --- --- This Source Code Form is subject to the terms of the Mozilla Public --- License, v. 2.0. If a copy of the MPL was not distributed with this --- file, You can obtain one at http://mozilla.org/MPL/2.0/. --- --- Copyright 2024, 2025 MonetDB Foundation; --- Copyright August 2008 - 2023 MonetDB B.V.; --- Copyright 1997 - July 2008 CWI. - -create function sys.read_nd_json(fname string) -returns table(json JSON) -external name json.read_nd_json; --- GRANT EXECUTE ON FUNCTION json.read_nd_json(string) TO PUBLIC; diff --git a/sql/backends/monet5/vaults/json/CMakeLists.txt b/sql/backends/monet5/vaults/json/CMakeLists.txt --- a/sql/backends/monet5/vaults/json/CMakeLists.txt +++ b/sql/backends/monet5/vaults/json/CMakeLists.txt @@ -16,14 +16,6 @@ else() add_library(json_loader MODULE) endif() - set(include_sql_files - 74_json) - - create_include_object( - SQL_LANGUAGE - name_module "json" - modules_list ${include_sql_files}) - target_sources(json_loader PRIVATE json.c) diff --git a/sql/backends/monet5/vaults/json/json.c b/sql/backends/monet5/vaults/json/json.c --- a/sql/backends/monet5/vaults/json/json.c +++ b/sql/backends/monet5/vaults/json/json.c @@ -325,6 +325,14 @@ JSONread_nd_json(Client cntxt, MalBlkPtr #include "mel.h" +unsigned char _json_sql[106] = { +"create function sys.read_nd_json(fname string)\n" +"returns table(json JSON)\n" +"external name json.read_nd_json;\n" +}; +#include "monetdb_config.h" +#include "sql_import.h" + static mel_func json_init_funcs[] = { pattern("json", "prelude", JSONprelude, false, "", noargs), command("json", "epilogue", JSONepilogue, false, "", noargs), @@ -338,5 +346,6 @@ static mel_func json_init_funcs[] = { #pragma section(".CRT$XCU",read) #endif LIB_STARTUP_FUNC(init_json_mal) -{ mal_module("json", NULL, json_init_funcs); } +{ mal_module("json", NULL, json_init_funcs); + sql_register("json", _json_sql); } diff --git a/sql/test/nested/Tests/All b/sql/test/nested/Tests/All --- a/sql/test/nested/Tests/All +++ b/sql/test/nested/Tests/All @@ -5,4 +5,5 @@ webclicks array composite jdocs -inserts +#bluesky +#inserts _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
