[icinga-checkins] icinga.org: icinga-web/next: Revert " SELECT DISTINCT on CLOBs breaks Oracle support"

git at icinga.org git at icinga.org
Mon Apr 22 09:28:22 CEST 2013


Module: icinga-web
Branch: next
Commit: 95beee9b94b1c10b277f2bf63b0e8bab63a6cab0
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=95beee9b94b1c10b277f2bf63b0e8bab63a6cab0

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Sat Apr 20 11:29:04 2013 +0200

Revert "SELECT DISTINCT on CLOBs breaks Oracle support"

This reverts commit f6876e7fb3569b9b151cf6bbe6310bcef7412a91.

refs #3965

---

 .../LegacyLayer/TargetModifierModel.class.php      |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
index 18b9b46..e958c67 100644
--- a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
+++ b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
@@ -21,11 +21,7 @@
 // -----------------------------------------------------------------------------
 // {{{ICINGA_LICENSE_CODE}}}
 
-/**
- * Class Api_Store_LegacyLayer_TargetModifierModel
- *
- * This model is the implementation of the old "IcingaApi" access style
- */
+
 class Api_Store_LegacyLayer_TargetModifierModel extends IcingaStoreTargetModifierModel {
     public function resolveColumnAlias($alias) {
         if (isset($this->columns[$alias])) {
@@ -406,14 +402,8 @@ class Api_Store_LegacyLayer_TargetModifierModel extends IcingaStoreTargetModifie
     protected $forceGroup = array();
     protected $resultColumns = array();
 
-    /**
-     * Reset the model into a fresh state
-     */
     public function reset() {
-        // Never use distinct as default
-        // produces ORA errors (#3965)
-        $this->setDistinct(false);
-
+        $this->setDistinct(true);
         $this->defaultJoinType = "inner";
         $this->additionalSelects = array();
         $this->forceGroup = array();





More information about the icinga-checkins mailing list