瀏覽代碼

Merge branch 'master' of bn.git:plabudda/se

Piotr Labudda 9 年之前
父節點
當前提交
bce7df8e8c
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 2 2
      SE/superedit-DB_PROCEDURES_CREATE.php
  2. 2 0
      SE/superedit-STATYSTYKA_TABELE.php

+ 2 - 2
SE/superedit-DB_PROCEDURES_CREATE.php

@@ -1052,8 +1052,8 @@ END
 //! ST__MK_Rewiry_to_BUILDINGS
 //! ST__MK_Rewiry_to_BUILDINGS
 $sql['ST__MK_Rewiry_to_BUILDINGS_event_drop']="DROP EVENT if exists ST__MK_Rewiry_to_BUILDINGS";
 $sql['ST__MK_Rewiry_to_BUILDINGS_event_drop']="DROP EVENT if exists ST__MK_Rewiry_to_BUILDINGS";
 $sql['ST__MK_Rewiry_to_BUILDINGS_event']="CREATE EVENT `ST__MK_Rewiry_to_BUILDINGS` ON SCHEDULE EVERY 1 DAY STARTS '2015-05-12 00:04:30' ON COMPLETION NOT PRESERVE ENABLE DO
 $sql['ST__MK_Rewiry_to_BUILDINGS_event']="CREATE EVENT `ST__MK_Rewiry_to_BUILDINGS` ON SCHEDULE EVERY 1 DAY STARTS '2015-05-12 00:04:30' ON COMPLETION NOT PRESERVE ENABLE DO
-update BUILDINGS as t1, MK_Rewiry as t2 , USERS2_MARKETING t3 set t1.M_REWIR=t2.NAZWA_REWI , t3.M_REWIR=t2.NAZWA_REWI
-where  ST_Contains(t2.the_geom, t1.the_geom) and t3.T_TELBOX_BUILDING_IN=t1.S_ADDRESS_STREET
+update BUILDINGS as t1, MK_Rewiry as t2 set t1.M_REWIR=t2.NAZWA_REWI 
+where  ST_Contains(t2.the_geom, t1.the_geom) ; 
 ";
 ";
 // EOF ST__MK_Rewiry_to_BUILDINGS
 // EOF ST__MK_Rewiry_to_BUILDINGS
 
 

+ 2 - 0
SE/superedit-STATYSTYKA_TABELE.php

@@ -629,6 +629,8 @@ function STATYSTYKA_TABELE() {
 
 
 			$sqlList[]="UPDATE BUILDINGS t1, MK_Rewiry t2 set t1.A_ADM_COMPANY=t2.A_ADM_COMPANY, t1.A_CLASSIFIED=t2.A_CLASSIFIED where t2.NAZWA_REWI=t1.M_REWIR";
 			$sqlList[]="UPDATE BUILDINGS t1, MK_Rewiry t2 set t1.A_ADM_COMPANY=t2.A_ADM_COMPANY, t1.A_CLASSIFIED=t2.A_CLASSIFIED where t2.NAZWA_REWI=t1.M_REWIR";
 			$sqlList[]="UPDATE USERS2_MARKETING t1, MK_Rewiry t2 set t1.A_ADM_COMPANY=t2.A_ADM_COMPANY, t1.A_CLASSIFIED=t2.A_CLASSIFIED where t2.NAZWA_REWI=t1.M_REWIR";
 			$sqlList[]="UPDATE USERS2_MARKETING t1, MK_Rewiry t2 set t1.A_ADM_COMPANY=t2.A_ADM_COMPANY, t1.A_CLASSIFIED=t2.A_CLASSIFIED where t2.NAZWA_REWI=t1.M_REWIR";
+			
+			$sqlList[]="UPDATE BUILDINGS t1, USERS2_MARKETING t2 set t2.M_REWIR=t1.M_REWIR where t1.S_ADDRESS_STREET=t2.T_TELBOX_BUILDING_IN";
 
 
 			$sqlList[]="UPDATE USERS2_OFFERS_GROUPS set A_CLASSIFIED='22913_PODMIOT_NETDAY_zoo_podmiot' , A_ADM_COMPANY='22913_PODMIOT_NETDAY_zoo_podmiot' where P_SERVICE_COMPANY='NETDAY' ";
 			$sqlList[]="UPDATE USERS2_OFFERS_GROUPS set A_CLASSIFIED='22913_PODMIOT_NETDAY_zoo_podmiot' , A_ADM_COMPANY='22913_PODMIOT_NETDAY_zoo_podmiot' where P_SERVICE_COMPANY='NETDAY' ";
 			$sqlList[]="UPDATE USERS2_OFFERS t1, USERS2_OFFERS_GROUPS t2 set t1.A_ADM_COMPANY=t2.A_ADM_COMPANY, t1.A_CLASSIFIED=t2.A_CLASSIFIED , t1.P_SERVICE_COMPANY=t2.P_SERVICE_COMPANY where t2.ID_NET=t1.ID or t2.ID_TEL=t1.ID or t2.ID_TV=t1.ID";
 			$sqlList[]="UPDATE USERS2_OFFERS t1, USERS2_OFFERS_GROUPS t2 set t1.A_ADM_COMPANY=t2.A_ADM_COMPANY, t1.A_CLASSIFIED=t2.A_CLASSIFIED , t1.P_SERVICE_COMPANY=t2.P_SERVICE_COMPANY where t2.ID_NET=t1.ID or t2.ID_TEL=t1.ID or t2.ID_TV=t1.ID";