mysql/core_cities_merge.sql
authorEdward <edward@roojs.com>
Fri, 27 Jun 2014 07:08:24 +0000 (15:08 +0800)
committerEdward <edward@roojs.com>
Fri, 27 Jun 2014 07:08:24 +0000 (15:08 +0800)
mysql/core_cities_merge.sql

index 9dda0b5..d15e6eb 100644 (file)
@@ -121,7 +121,7 @@ CREATE FUNCTION core_cities_merge_division()  RETURNS INT DETERMINISTIC
                 
             END IF;
 
-            SELECT id INTO v_division_id FROM core_geoip_division WHERE name = v_local_name AND country_id = v_country_id;
+            SELECT id INTO v_division_id FROM core_geoip_division WHERE (name = v_local_name OR (name LIKE (CONCAT('%', v_local_name, '%')) AND code = SUBSTRING_INDEX(v_iso, '-', -1)) AND country_id = v_country_id;
 
             IF(v_division_id = 0) THEN