Changeset: 79f2752c4de9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=79f2752c4de9
Added Files:
sql/scripts/41_json_hge.sql
sql/scripts/42_md5sum.sql
Removed Files:
sql/scripts/40_json_hge.sql
sql/scripts/41_md5sum.sql
Modified Files:
sql/backends/monet5/CMakeLists.txt
sql/scripts/CMakeLists.txt
Branch: Oct2020
Log Message:
Rename some files so that they get loaded in the correct order.
You cannot load json_hge before json since the type needs to be there.
diffs (48 lines):
diff --git a/sql/backends/monet5/CMakeLists.txt
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -30,7 +30,7 @@ set(include_sql_files
27_rejects
39_analytics
40_json
- 41_md5sum
+ 42_md5sum
45_uuid
46_profiler
51_sys_schema_extension
@@ -44,7 +44,7 @@ set(include_sql_files
if(HAVE_HGE)
list(APPEND include_sql_files
39_analytics_hge
- 40_json_hge)
+ 41_json_hge)
endif()
create_include_object(
diff --git a/sql/scripts/40_json_hge.sql b/sql/scripts/41_json_hge.sql
rename from sql/scripts/40_json_hge.sql
rename to sql/scripts/41_json_hge.sql
diff --git a/sql/scripts/41_md5sum.sql b/sql/scripts/42_md5sum.sql
rename from sql/scripts/41_md5sum.sql
rename to sql/scripts/42_md5sum.sql
diff --git a/sql/scripts/CMakeLists.txt b/sql/scripts/CMakeLists.txt
--- a/sql/scripts/CMakeLists.txt
+++ b/sql/scripts/CMakeLists.txt
@@ -24,7 +24,7 @@ install(FILES
27_rejects.sql
39_analytics.sql
40_json.sql
- 41_md5sum.sql
+ 42_md5sum.sql
45_uuid.sql
46_profiler.sql
51_sys_schema_extension.sql
@@ -40,7 +40,7 @@ install(FILES
if(HAVE_HGE)
install(FILES
39_analytics_hge.sql
- 40_json_hge.sql DESTINATION
+ 41_json_hge.sql DESTINATION
${CMAKE_INSTALL_LIBDIR}/monetdb5/createdb)
endif()
#]]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
