....I...S. [ZBXNEXT-1736] added optional patch for oracle db

3 files changed, 53 insertions, 11 deletions

diff --git a/database/mysql/double.sql b/database/mysql/double.sql
index a48d0f776e9..c4205a873eb 100644
--- a/database/mysql/double.sql
+++ b/database/mysql/double.sql
@@ -1,9 +1,11 @@
-ALTER TABLE graphs MODIFY yaxismin DOUBLE PRECISION;
-ALTER TABLE graphs MODIFY yaxismax DOUBLE PRECISION;
-ALTER TABLE graphs MODIFY percent_left DOUBLE PRECISION;
-ALTER TABLE graphs MODIFY percent_right DOUBLE PRECISION;
-ALTER TABLE trends MODIFY value_min DOUBLE PRECISION;
-ALTER TABLE trends MODIFY value_avg DOUBLE PRECISION;
-ALTER TABLE trends MODIFY value_max DOUBLE PRECISION;
-ALTER TABLE services MODIFY goodsla DOUBLE PRECISION;
-ALTER TABLE history MODIFY value DOUBLE PRECISION;
+ALTER TABLE graphs
+	MODIFY yaxismin DOUBLE PRECISION DEFAULT '0' NOT NULL,
+	MODIFY yaxismax DOUBLE PRECISION DEFAULT '100' NOT NULL,
+	MODIFY percent_left DOUBLE PRECISION DEFAULT '0' NOT NULL,
+	MODIFY percent_right DOUBLE PRECISION DEFAULT '0' NOT NULL;
+ALTER TABLE trends
+	MODIFY value_min DOUBLE PRECISION DEFAULT '0.0000' NOT NULL,
+	MODIFY value_avg DOUBLE PRECISION DEFAULT '0.0000' NOT NULL,
+	MODIFY value_max DOUBLE PRECISION DEFAULT '0.0000' NOT NULL;
+ALTER TABLE services MODIFY goodsla DOUBLE PRECISION DEFAULT '99.9' NOT NULL;
+ALTER TABLE history MODIFY value DOUBLE PRECISION DEFAULT '0.0000' NOT NULL;
diff --git a/database/oracle/Makefile.am b/database/oracle/Makefile.am
index 0bd342bdac6..51010e38573 100644
--- a/database/oracle/Makefile.am
+++ b/database/oracle/Makefile.am
@@ -1,10 +1,10 @@
 if DBSCHEMA
 DATABASE = oracle
 
-data.sql: $(top_srcdir)/create/src/data.tmpl $(top_srcdir)/create/src/templates.tmpl $(top_srcdir)/create/src/dashboards.tmpl
+data.sql: $(top_srcdir)/create/src/data.tmpl $(top_srcdir)/create/src/templates.tmpl $(top_srcdir)/create/src/dashboards.tmpl $(top_srcdir)/create/bin/gen_data.pl
 	$(top_srcdir)/create/bin/gen_data.pl $(DATABASE) > data.sql
 
-schema.sql: $(top_srcdir)/create/src/schema.tmpl
+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
 endif
 
diff --git a/database/oracle/double.sql b/database/oracle/double.sql
new file mode 100644
index 00000000000..26a2ca54b23
--- /dev/null
+++ b/database/oracle/double.sql
@@ -0,0 +1,40 @@
+ALTER TABLE graphs RENAME COLUMN yaxismin TO zbx_old_tmp1;
+ALTER TABLE graphs RENAME COLUMN yaxismax TO zbx_old_tmp2;
+ALTER TABLE graphs RENAME COLUMN percent_left TO zbx_old_tmp3;
+ALTER TABLE graphs RENAME COLUMN percent_right TO zbx_old_tmp4;
+ALTER TABLE graphs
+	ADD (yaxismin BINARY_DOUBLE DEFAULT '0' NOT NULL,
+		yaxismax BINARY_DOUBLE DEFAULT '100' NOT NULL,
+		percent_left BINARY_DOUBLE DEFAULT '0' NOT NULL,
+		percent_right BINARY_DOUBLE DEFAULT '0' NOT NULL);
+UPDATE graphs
+	SET yaxismin=zbx_old_tmp1,
+		yaxismax=zbx_old_tmp2,
+		percent_left=zbx_old_tmp3,
+		percent_right=zbx_old_tmp4;
+ALTER TABLE graphs DROP COLUMN zbx_old_tmp1;
+ALTER TABLE graphs DROP COLUMN zbx_old_tmp2;
+ALTER TABLE graphs DROP COLUMN zbx_old_tmp3;
+ALTER TABLE graphs DROP COLUMN zbx_old_tmp4;
+ALTER TABLE trends RENAME COLUMN value_min TO zbx_old_tmp1;
+ALTER TABLE trends RENAME COLUMN value_avg TO zbx_old_tmp2;
+ALTER TABLE trends RENAME COLUMN value_max TO zbx_old_tmp3;
+ALTER TABLE trends
+	ADD (value_min BINARY_DOUBLE DEFAULT '0.0000' NOT NULL,
+		value_avg BINARY_DOUBLE DEFAULT '0.0000' NOT NULL,
+		value_max BINARY_DOUBLE DEFAULT '0.0000' NOT NULL);
+UPDATE trends
+	SET value_min=zbx_old_tmp1,
+		value_avg=zbx_old_tmp2,
+		value_max=zbx_old_tmp3;
+ALTER TABLE trends DROP COLUMN zbx_old_tmp1;
+ALTER TABLE trends DROP COLUMN zbx_old_tmp2;
+ALTER TABLE trends DROP COLUMN zbx_old_tmp3;
+ALTER TABLE services RENAME COLUMN goodsla TO zbx_old_tmp1;
+ALTER TABLE services ADD goodsla BINARY_DOUBLE DEFAULT '99.9' NOT NULL;
+UPDATE services SET goodsla=zbx_old_tmp1;
+ALTER TABLE services DROP COLUMN zbx_old_tmp1;
+ALTER TABLE history RENAME COLUMN value TO zbx_old_tmp1;
+ALTER TABLE history ADD value BINARY_DOUBLE DEFAULT '0.0000' NOT NULL;
+UPDATE history SET value=zbx_old_tmp1;
+ALTER TABLE history DROP COLUMN zbx_old_tmp1;