[icinga-checkins] icinga.org: icinga-core/cmaser/fixes: fix typo in servicedepencies query for oracle

git at icinga.org git at icinga.org
Fri Jul 30 22:45:49 CEST 2010


Module: icinga-core
Branch: cmaser/fixes
Commit: df5c760ff38c2615019cfcb414fcee6b3b9c85f1
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=df5c760ff38c2615019cfcb414fcee6b3b9c85f1

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Jul 27 16:22:16 2010 +0200

fix typo in servicedepencies query for oracle

---

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

diff --git a/Changelog b/Changelog
index f8fb7cc..61eebd2 100644
--- a/Changelog
+++ b/Changelog
@@ -20,6 +20,7 @@ FIXES
 
 * idoutils: adapt oracle-drop.sql for current schema
 * idoutils: fix binding null values to prepared statements in oracle
+* idoutils: fix typo in servicedepencies query for oracle
 
 
 1.0.2 - 30/06/2010
diff --git a/module/idoutils/src/db.c b/module/idoutils/src/db.c
index 49c075e..f4d8031 100644
--- a/module/idoutils/src/db.c
+++ b/module/idoutils/src/db.c
@@ -4730,7 +4730,7 @@ int ido2db_oci_prepared_statement_servicedependencydefinition_definition(ido2db_
 
         //ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_oci_prepared_statement_() start\n");
 
-        if(asprintf(&buf, "MERGE INTO %s USING DUAL ON (nstance_id=:X1 AND config_type=:X2 AND service_object_id=:X3 AND dependent_service_object_id=:X4 AND dependency_type=:X5 AND inherits_parent=:X6 AND fail_on_ok=:X8 AND fail_on_warning=:X9 AND fail_on_unknown=:X10 AND fail_on_critical=:X11) WHEN MATCHED THEN UPDATE SET timeperiod_object_id=:X7 WHEN NOT MATCHED THEN INSERT (id, instance_id, config_type, service_object_id, dependent_service_object_id, dependency_type, inherits_parent, timeperiod_object_id, fail_on_ok, fail_on_warning, fail_on_unknown, fail_on_critical) VALUES (seq_servicedependencies.nextval, :X1, :X2, :X3, :X4, :X5, :X6, :X7, :X8, :X9, :X10, :X11)",
+        if(asprintf(&buf, "MERGE INTO %s USING DUAL ON (instance_id=:X1 AND config_type=:X2 AND service_object_id=:X3 AND dependent_service_object_id=:X4 AND dependency_type=:X5 AND inherits_parent=:X6 AND fail_on_ok=:X8 AND fail_on_warning=:X9 AND fail_on_unknown=:X10 AND fail_on_critical=:X11) WHEN MATCHED THEN UPDATE SET timeperiod_object_id=:X7 WHEN NOT MATCHED THEN INSERT (id, instance_id, config_type, service_object_id, dependent_service_object_id, dependency_type, inherits_parent, timeperiod_object_id, fail_on_ok, fail_on_warning, fail_on_unknown, fail_on_critical) VALUES (seq_servicedependencies.nextval, :X1, :X2, :X3, :X4, :X5, :X6, :X7, :X8, :X9, :X10, :X11)",
                 ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICEDEPENDENCIES]) == -1) {
                         buf = NULL;
         }





More information about the icinga-checkins mailing list