Changeset: c09b8bf2b278 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/c09b8bf2b278 Branch: tvtree Log Message:
merged with nested diffs (50 lines): diff --git a/sql/backends/monet5/vaults/json/74_json.sql b/sql/backends/monet5/vaults/json/74_json.sql new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/vaults/json/74_json.sql @@ -0,0 +1,14 @@ +-- 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,6 +16,14 @@ 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/scripts/40_json.sql b/sql/scripts/40_json.sql --- a/sql/scripts/40_json.sql +++ b/sql/scripts/40_json.sql @@ -104,9 +104,3 @@ create aggregate json.tojsonarray( x str GRANT EXECUTE ON AGGREGATE json.tojsonarray( string ) TO PUBLIC; create aggregate json.tojsonarray( x double ) returns string external name aggr.jsonaggr; GRANT EXECUTE ON AGGREGATE json.tojsonarray( double ) TO PUBLIC; - - -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; _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
