Ubuntu Geonames

Merge lp:~gnuoy/ubuntu-geonames/switch-indexes-in into lp:ubuntu-geonames

  1. switch-indexes-in
  2. Merge into trunk
Proposed by Liam Young
Status: Merged
Merged at revision: 28
Proposed branch: lp:~gnuoy/ubuntu-geonames/switch-indexes-in
Merge into: lp:ubuntu-geonames
Diff against target: 29 lines (+8/-4)
1 file modified
import-geonames.sh (+8/-4)
To merge this branch: bzr merge lp:~gnuoy/ubuntu-geonames/switch-indexes-in
Reviewer Review Type Date Requested Status
Ubuntu Geonames Hackers Pending
Review via email: mp+185505@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'import-geonames.sh'
--- import-geonames.sh 2013-09-13 10:34:31 +0000
+++ import-geonames.sh 2013-09-13 14:16:48 +0000
@@ -144,6 +144,10 @@
144INSERT INTO continentCodes${LOAD_POSTFIX} VALUES ('OC', 'Oceania', 6255150);144INSERT INTO continentCodes${LOAD_POSTFIX} VALUES ('OC', 'Oceania', 6255150);
145INSERT INTO continentCodes${LOAD_POSTFIX} VALUES ('SA', 'South America', 6255151);145INSERT INTO continentCodes${LOAD_POSTFIX} VALUES ('SA', 'South America', 6255151);
146INSERT INTO continentCodes${LOAD_POSTFIX} VALUES ('AN', 'Antarctica', 6255152);146INSERT INTO continentCodes${LOAD_POSTFIX} VALUES ('AN', 'Antarctica', 6255152);
147CREATE INDEX geoname_id_idx${LOAD_POSTFIX} ON geoname${LOAD_POSTFIX}(geonameid);
148CREATE INDEX geoname_admin1codes_code_idx${LOAD_POSTFIX} ON admin1codes${LOAD_POSTFIX}(code);
149CREATE INDEX geoname_countryinfo_isoalpha2_idx${LOAD_POSTFIX} ON countryinfo${LOAD_POSTFIX}(iso_alpha2);
150CREATE INDEX geoname_alternatename_idx${LOAD_POSTFIX} ON alternatename${LOAD_POSTFIX}(alternatenameId);
147COMMIT;151COMMIT;
148EOT152EOT
149153
@@ -186,10 +190,10 @@
186ALTER TABLE admin1codes${LOAD_POSTFIX} RENAME TO admin1codes;190ALTER TABLE admin1codes${LOAD_POSTFIX} RENAME TO admin1codes;
187ALTER TABLE timeZones${LOAD_POSTFIX} RENAME TO timeZones;191ALTER TABLE timeZones${LOAD_POSTFIX} RENAME TO timeZones;
188ALTER TABLE continentCodes${LOAD_POSTFIX} RENAME TO continentCodes;192ALTER TABLE continentCodes${LOAD_POSTFIX} RENAME TO continentCodes;
189CREATE INDEX geoname_id_idx ON geoname(geonameid);193ALTER INDEX geoname_id_idx${LOAD_POSTFIX} RENAME TO geoname_id_idx;
190CREATE INDEX geoname_admin1codes_code_idx ON admin1codes(code);194ALTER INDEX geoname_admin1codes_code_idx${LOAD_POSTFIX} RENAME TO geoname_admin1codes_code_idx;
191CREATE INDEX geoname_countryinfo_isoalpha2_idx ON countryinfo(iso_alpha2);195ALTER INDEX geoname_countryinfo_isoalpha2_idx${LOAD_POSTFIX} RENAME TO geoname_countryinfo_isoalpha2_idx;
192CREATE INDEX geoname_alternatename_idx ON alternatename(alternatenameId);196ALTER INDEX geoname_alternatename_idx${LOAD_POSTFIX} RENAME TO geoname_alternatename_idx;
193GRANT ALL PRIVILEGES ON geoname, admin1codes, countryInfo, alternatename TO $PGUSER;197GRANT ALL PRIVILEGES ON geoname, admin1codes, countryInfo, alternatename TO $PGUSER;
194GRANT SELECT ON geoname, admin1codes, countryInfo, alternatename TO public;198GRANT SELECT ON geoname, admin1codes, countryInfo, alternatename TO public;
195COMMIT;199COMMIT;

Subscribers

People subscribed via source and target branches

to all changes: