Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndris Zeila <andris.zeila@zabbix.com>2022-05-16 15:41:58 +0300
committerAndris Zeila <andris.zeila@zabbix.com>2022-05-16 15:41:58 +0300
commitfcb9513306cebfe9c49ec99d565e341617094683 (patch)
tree18a0217b0e70cd23f48f5c55eaa27488e16c4d74 /database
parentea7334bd17e4dcc71516dcbb38342f4686d66371 (diff)
.......... [ZBXNEXT-7554] removed delete cascade from changelog tables, updated schema generation to return error when delete cascade is used with changelog table
Diffstat (limited to 'database')
-rw-r--r--database/mysql/Makefile.am3
-rw-r--r--database/oracle/Makefile.am2
-rw-r--r--database/postgresql/Makefile.am2
-rw-r--r--database/sqlite3/Makefile.am2
4 files changed, 5 insertions, 4 deletions
diff --git a/database/mysql/Makefile.am b/database/mysql/Makefile.am
index 28fadb7247f..ccbcfb9b6a4 100644
--- a/database/mysql/Makefile.am
+++ b/database/mysql/Makefile.am
@@ -5,7 +5,8 @@ data.sql: $(top_srcdir)/create/src/data.tmpl $(top_srcdir)/create/src/templates.
$(top_srcdir)/create/bin/gen_data.pl $(DATABASE) > data.sql
schema.sql: $(top_srcdir)/create/src/schema.tmpl $(top_srcdir)/create/bin/gen_schema.pl
- $(top_srcdir)/create/bin/gen_schema.pl $(DATABASE) > schema.sql
+ $(top_srcdir)/create/bin/gen_schema.pl $(DATABASE) > schema.sql || (rm -rf schema.sql && exit 1)
+
endif
EXTRA_DIST = \
diff --git a/database/oracle/Makefile.am b/database/oracle/Makefile.am
index a81fa3083d3..d7f2c216cb8 100644
--- a/database/oracle/Makefile.am
+++ b/database/oracle/Makefile.am
@@ -5,7 +5,7 @@ data.sql: $(top_srcdir)/create/src/data.tmpl $(top_srcdir)/create/src/templates.
$(top_srcdir)/create/bin/gen_data.pl $(DATABASE) > data.sql
schema.sql: $(top_srcdir)/create/src/schema.tmpl $(top_srcdir)/create/bin/gen_data.pl
- $(top_srcdir)/create/bin/gen_schema.pl $(DATABASE) > schema.sql
+ $(top_srcdir)/create/bin/gen_schema.pl $(DATABASE) > schema.sql || (rm -rf schema.sql && exit 1)
endif
EXTRA_DIST = \
diff --git a/database/postgresql/Makefile.am b/database/postgresql/Makefile.am
index c17aafbc33f..95bca4eeddf 100644
--- a/database/postgresql/Makefile.am
+++ b/database/postgresql/Makefile.am
@@ -6,7 +6,7 @@ data.sql: $(top_srcdir)/create/src/data.tmpl $(top_srcdir)/create/src/templates.
$(top_srcdir)/create/bin/gen_data.pl $(DATABASE) > data.sql
schema.sql: $(top_srcdir)/create/src/schema.tmpl $(top_srcdir)/create/bin/gen_schema.pl
- $(top_srcdir)/create/bin/gen_schema.pl $(DATABASE) > schema.sql
+ $(top_srcdir)/create/bin/gen_schema.pl $(DATABASE) > schema.sql || (rm -rf schema.sql && exit 1)
$(DB_EXTENSION).sql:
$(top_srcdir)/create/bin/gen_schema.pl $(DB_EXTENSION) > $(DB_EXTENSION).sql
diff --git a/database/sqlite3/Makefile.am b/database/sqlite3/Makefile.am
index 25b07341b9d..b23cd87765d 100644
--- a/database/sqlite3/Makefile.am
+++ b/database/sqlite3/Makefile.am
@@ -5,7 +5,7 @@ data.sql: $(top_srcdir)/create/src/data.tmpl $(top_srcdir)/create/src/templates.
$(top_srcdir)/create/bin/gen_data.pl $(DATABASE) > data.sql
schema.sql: $(top_srcdir)/create/src/schema.tmpl
- $(top_srcdir)/create/bin/gen_schema.pl $(DATABASE) > schema.sql
+ $(top_srcdir)/create/bin/gen_schema.pl $(DATABASE) > schema.sql || (rm -rf schema.sql && exit 1)
endif
EXTRA_DIST = \