[icinga-checkins] icinga.org: icinga-core/r1.6: idoutils: fix ORA-00913 too many values when MERGE INTO eventhandlers #2319

git at icinga.org git at icinga.org
Sat Apr 28 11:16:51 CEST 2012


Module: icinga-core
Branch: r1.6
Commit: dd9a85f13acc31c2caa0fbb1ebd7f5bcc62ec7ed
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=dd9a85f13acc31c2caa0fbb1ebd7f5bcc62ec7ed

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Feb 18 11:38:06 2012 +0100

idoutils: fix ORA-00913 too many values when MERGE INTO eventhandlers #2319

refs #2319

Conflicts:

	Changelog

---

 Changelog                |    1 +
 module/idoutils/src/db.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index 0a3dd7a..beb2a31 100644
--- a/Changelog
+++ b/Changelog
@@ -21,6 +21,7 @@ FIXES
 + classic ui: fixed msdropdown jquery issues with opera #2515
 
 * idoutils: change standard string escaping for postgresql queries to use the E'foo' notation #1974
+* idoutils: fix ORA-00913 too many values when MERGE INTO eventhandlers #2319
 
 CHANGES
 
diff --git a/module/idoutils/src/db.c b/module/idoutils/src/db.c
index cb842c9..ad83711 100644
--- a/module/idoutils/src/db.c
+++ b/module/idoutils/src/db.c
@@ -4712,7 +4712,7 @@ int ido2db_oci_prepared_statement_eventhandlerdata(ido2db_idi *idi) {
 	             "timeout=:X13, early_timeout=:X14, execution_time=:X15, "
 	             "return_code=:X16, output=:X17, long_output=:X18u "
 	             "WHEN NOT MATCHED THEN "
-	             "INSERT (instance_id, eventhandler_type, object_id, "
+	             "INSERT (id, instance_id, eventhandler_type, object_id, "
 	             "state, state_type, start_time, start_time_usec, "
 	             "end_time, end_time_usec, command_object_id, "
 	             "command_args, command_line, "





More information about the icinga-checkins mailing list