From: Alan Knowles <alan@roojs.com>
Date: Tue, 24 Oct 2017 04:50:38 +0000 (+0800)
Subject: fix
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=ec5bc3910b8a0574fce82d1acffabf198734c1c3

fix
---

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 5b002e96..463ea3e4 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -25,6 +25,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     public $person_id;                       // int(11)  
     public $remarks;                         // blob(65535)  blob
     public $person_table;                    // string(64)
+    public $dupe_id;                    // int(11)
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -91,13 +92,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $this->whereAdd(" {$tn}.event_when <=  '$dt' ");
         }
         
-        if(!empty($q['dup_check'])){
-        	   $et = DB_DataObject::factory($tn);
-            $this->_join .= "LEFT JOIN {$et->tableName()} AS evet ON (evet.id=Events.id)";
-            $this->selectAdd("(select count(*)+1 from Events where Events.dup_id = evet.id) as cnt ");        	   
-        	   //$this->selectAs($et,'%s','evet');
-        	   $this->having('Events.dup_id = 0 ');
-            
+        if(!empty($q['_with_dupe_count'])){
+            $this->dupe_id = 0;        	                   
+            $this->selectAdd("(select count(*)+1 from Events where Events.dupe_id = {$tn}.id) as dupe_count");
         }
         /*
         if (!empty($q['query']['grouped']) && $q['query']['grouped'] == 'gr') {
diff --git a/sql/events.sql b/sql/events.sql
index f99ba597..827549ba 100644
--- a/sql/events.sql
+++ b/sql/events.sql
@@ -16,6 +16,8 @@ ALTER TABLE Events ADD COLUMN   on_id int(11) NOT NULL default 0;
 ALTER TABLE Events ADD COLUMN   on_table varchar(64) NOT NULL default '';
 ALTER TABLE Events ADD COLUMN   person_id int(11) NOT NULL default 0;
 ALTER TABLE Events ADD COLUMN   person_table varchar(64) NOT NULL default '';
+ALTER TABLE Events ADD COLUMN   dupe_id INT(11) NOT NULL DEFAULT 0;
+
 
 ALTER TABLE Events ADD COLUMN   remarks text ;