From: Stéphane Jacob Date: Fri, 7 Jan 2011 14:05:17 +0000 (+0100) Subject: Removes erroneous field addition. X-Git-Tag: xorg/1.0.2~37 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ee1f55352ef94df2e4dcc5599d746fa0d8b5f7b0;p=platal.git Removes erroneous field addition. Signed-off-by: Stéphane Jacob --- diff --git a/classes/address.php b/classes/address.php index 7757e02..f4a951e 100644 --- a/classes/address.php +++ b/classes/address.php @@ -874,7 +874,7 @@ class AddressIterator implements PlIterator gl.name AS locality, gl.nameLocal AS localityLocal, gs.name AS subAdministrativeArea, gs.nameLocal AS subAdministrativeAreaLocal, ga.name AS administrativeArea, ga.nameLocal AS administrativeAreaLocal, - gc.country, gc.countryLocal + gc.country FROM profile_addresses AS pa LEFT JOIN geoloc_localities AS gl ON (gl.id = pa.localityId) LEFT JOIN geoloc_administrativeareas AS ga ON (ga.id = pa.administrativeAreaId) diff --git a/upgrade/1.0.2/06_geocoding.sql b/upgrade/1.0.2/06_geocoding.sql index 3d55e15..871b20e 100644 --- a/upgrade/1.0.2/06_geocoding.sql +++ b/upgrade/1.0.2/06_geocoding.sql @@ -6,7 +6,6 @@ ALTER TABLE geoloc_countries CHANGE COLUMN country countryEn VARCHAR(255) DEFAUL ALTER TABLE geoloc_countries CHANGE COLUMN countryFR country VARCHAR(255) DEFAULT NULL; ALTER TABLE geoloc_countries CHANGE COLUMN nationality nationalityEn VARCHAR(255) DEFAULT NULL; ALTER TABLE geoloc_countries CHANGE COLUMN nationalityFR nationality VARCHAR(255) DEFAULT NULL; -ALTER TABLE geoloc_countries ADD COLUMN countryLocal VARCHAR(255) DEFAULT NULL; ALTER TABLE geoloc_countries ADD COLUMN countryPlain VARCHAR(255) DEFAULT NULL; INSERT INTO geoloc_countries (iso_3166_1_a2, iso_3166_1_a3, iso_3166_1_num, worldRegion,