Revert "SELECT DISTINCT on CLOBs breaks Oracle support"

This reverts commit b195821. refs #3965
Icinga · Apr 21, 2013 · 4991c66 · 4991c66
1 parent db11592
commit 4991c66
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 63 deletions.
diff --git a/app/modules/Api/actions/ApiSearchAction.class.php b/app/modules/Api/actions/ApiSearchAction.class.php
@@ -130,21 +130,14 @@ public function executeRead(AgaviRequestDataHolder $rd) {
 
         // Rewrite output, e.g. plugin_output
         // see #2598
-
-        /** @var $rewrite Api_Result_OutputRewriteModel **/
+
         $rewrite = $this->getContext()->getModel('Result.OutputRewrite', 'Api', array(
                 'target' => $target,
                 'optional' => $rd->getParameter('enableRewrite', false)
         ));
 
         $res = $rewrite->rewrite($res);
-
-        // Distinct rows
-        // see #3965
-
-        /** @var $distinct Api_Result_DistinctOutputModel **/
-        $distinct = $this->getContext()->getModel('Result.DistinctOutput', 'Api');
-        $res = $distinct->distinctRows($res);
+
 
         $rd->setParameter("searchResult", $res);
 

diff --git a/app/modules/Api/models/Result/DistinctOutputModel.class.php b/app/modules/Api/models/Result/DistinctOutputModel.class.php
diff --git a/app/modules/Cronks/views/System/ViewProcSuccessView.class.php b/app/modules/Cronks/views/System/ViewProcSuccessView.class.php
@@ -139,14 +139,6 @@ public function executeJson(AgaviRequestDataHolder $rd) {
             $worker->buildAll();
 
             $data = $worker->fetchDataArray();
-
-            // Distinct rows
-            // see #3965
-
-            /** @var $distinct Api_Result_DistinctOutputModel **/
-            $distinct = $this->getContext()->getModel('Result.DistinctOutput', 'Api');
-            $data = $distinct->distinctRows($data);
-
             $worker->countResults();
 
             $jsonResult->hasFieldBulk(array_fill_keys($template->getFieldKeys(), ""));