projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1c18567
)
mysql/core_cities_merge.sql
author
Edward
<edward@roojs.com>
Thu, 26 Jun 2014 10:22:12 +0000
(18:22 +0800)
committer
Edward
<edward@roojs.com>
Thu, 26 Jun 2014 10:22:12 +0000
(18:22 +0800)
mysql/core_cities_merge.sql
patch
|
blob
|
history
diff --git
a/mysql/core_cities_merge.sql
b/mysql/core_cities_merge.sql
index
3149e7c
..
4c21f42
100644
(file)
--- a/
mysql/core_cities_merge.sql
+++ b/
mysql/core_cities_merge.sql
@@
-268,7
+268,13
@@
CREATE FUNCTION core_country_locations() RETURNS INT DETERMINISTIC
SET v_country_id = 0;
SET v_continent_id = 0;
- SELECT id INTO v_id_tmp FROM core_geoip_country WHERE code = v_iso;
+ IF (v_continent_code != '') THEN
+ SELECT id INTO v_continent_id FROM core_geoip_continent WHERE code = v_continent_code;
+
+
+ END IF;
+
+
IF(v_id_tmp = 0) THEN
INSERT INTO core_geoip_country (code, name, continent_id) VALUES (v_iso, v_local_name, 0);