Selaa lähdekoodia

Merge branch 'master' of biuro.biall-net.pl:plabudda/se

Piotr Labudda 11 vuotta sitten
vanhempi
commit
914dbdc85e
1 muutettua tiedostoa jossa 3 lisäystä ja 2 poistoa
  1. 3 2
      SE/superedit-DB_PROCEDURES_CREATE.php

+ 3 - 2
SE/superedit-DB_PROCEDURES_CREATE.php

@@ -220,7 +220,7 @@ $sql['create__IN7_MK_BAZA_DYSTRYBUCJI_tree_UPDATE']="CREATE DEFINER=`root`@`loca
 IF NEW.P_ID<>OLD.P_ID THEN 
 IF NEW.P_ID<>OLD.P_ID THEN 
 	SET NEW.path = IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.P_ID);
 	SET NEW.path = IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.P_ID);
 	update IN7_DZIENNIK_KORESP ik set ik.path=IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.ID) where path like concat('%',NEW.ID,'%');
 	update IN7_DZIENNIK_KORESP ik set ik.path=IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.ID) where path like concat('%',NEW.ID,'%');
-	update PROBLEMS ik set ik.ID_PROJET_path=IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.ID) where ID_PROJET_path like concat('%',NEW.ID,'%');
+	update PROBLEMS ik set ik.ID_PROJECT_path=IN7_MK_BAZA_DYSTRYBUCJI_hierarchy_sys_connect_by_path('-', NEW.ID) where ID_PROJET_path like concat('%',NEW.ID,'%');
 
 
 END IF;
 END IF;
 END
 END
@@ -591,7 +591,8 @@ $sql['drop__CRM_PROCES_GOTO_CACHE']="drop table if exists _CRM_PROCES_GOTO_CACHE
 $sql_tmp['select_CRM_PROCES_GOTO_CACHE']="select t1.ID,t1.ID_PROCES_INIT,t2.IF_TRUE_GOTO , t2.IF_TRUE_GOTO_FLAG, now() as TIMESTAMP
 $sql_tmp['select_CRM_PROCES_GOTO_CACHE']="select t1.ID,t1.ID_PROCES_INIT,t2.IF_TRUE_GOTO , t2.IF_TRUE_GOTO_FLAG, now() as TIMESTAMP
 	 from _CRM_PROCES_STATS_proc_wiev t1 
 	 from _CRM_PROCES_STATS_proc_wiev t1 
 	inner join CRM_PROCES as t2 on ( t1.ID=t2.ID and t2.IF_TRUE_GOTO>0 and t2.IF_TRUE_GOTO_FLAG='GOTO_AND_RETURN' ) 
 	inner join CRM_PROCES as t2 on ( t1.ID=t2.ID and t2.IF_TRUE_GOTO>0 and t2.IF_TRUE_GOTO_FLAG='GOTO_AND_RETURN' ) 
-	-- inner join CRM_PROCES as t3 on ( t2.IF_TRUE_GOTO=t3.ID and t2.IF_TRUE_GOTO>0 and t2.IF_TRUE_GOTO_FLAG='GOTO_AND_RETURN' )  TODO@2014-09-04 trzeba rekursywnie podlapac wzajemne powiazania
+	 inner join CRM_PROCES as t3 on ( t2.IF_TRUE_GOTO=t3.ID and t2.IF_TRUE_GOTO>0 and t2.IF_TRUE_GOTO_FLAG='GOTO_AND_RETURN' ) 
+	-- TODO@2014-09-04 trzeba rekursywnie podlapac wzajemne powiazania
 
 
 	where t1.ID_PROCES_INIT>0
 	where t1.ID_PROCES_INIT>0
 	";
 	";