share/sql/geo.sql

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index 501745226ec787eaeb3e392d3b90147645d2389d..a71672db4e87c5c3461b70bdf7d315e5d0eb36fc 100644 (file)
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -796,7 +796,6 @@ Class Table extends nb {
 #bye("$equal$v");
       #if (preg_match("/(LIKE|$regexp) ..$/","$equal$v")) {
       if (preg_match("/^(LIKE|$regexp)$/",trim($equal))) {
-                       #if (trim($equal) == 'LIKE' or trim($equal) == $regexp) {
         if ($field->null) $k = 'COALESCE('.$name.','.$this->db()->quote('').")";
 
       } elseif ($field->extras) {

diff --git a/share/sql/geo.sql b/share/sql/geo.sql
index 655caf0b69d16f0c45088aaa8684b5bd39f0da65..c567b051e3887dab7d69610c1305625fd22b7f25 100644 (file)
--- a/share/sql/geo.sql
+++ b/share/sql/geo.sql
@@ -42,7 +42,7 @@ CREATE TABLE IF NOT EXISTS geo (
 GRANT ALL ON ALL TABLES IN SCHEMA public TO www;
 GRANT ALL ON ALL TABLES IN SCHEMA public TO nico;
 GRANT ALL ON ALL TABLES IN SCHEMA public TO root;
-CREATE INDEX IF NOT EXISTS geo_country_idx ON geo (country);
+CREATE INDEX geo_country_idx ON geo (country);
 BEGIN TRANSACTION;
 DELETE FROM geo;
 COPY geo FROM PROGRAM 'curl -s http://download.geonames.org/export/dump/allCountries.zip | zcat' WITH (format 'text', NULL '');