unity-scope-click

Merge lp:~stolowski/unity-scope-click/new-departments into lp:unity-scope-click/devel

  1. new-departments
  2. Merge into devel
Proposed by Paweł Stołowski
Status: Merged
Approved by: dobey
Approved revision: 409
Merged at revision: 405
Proposed branch: lp:~stolowski/unity-scope-click/new-departments
Merge into: lp:unity-scope-click/devel
Diff against target: 133 lines (+103/-1)
3 files modified
HACKING (+5/-0)
data/update_schema.sh (+97/-0)
libclickscope/click/departments-db.cpp (+1/-1)
To merge this branch: bzr merge lp:~stolowski/unity-scope-click/new-departments
Reviewer Review Type Date Requested Status
dobey (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+231209@code.launchpad.net

Commit message

Provide updated departments to match latest server changes. Bumped schema to 3.

Description of the change

Provide updated departments to match latest server changes: schema is bumped from 2 to 3, and update script is executed on first boot after updating click scope package; the script replaces existing department mappings and moves packages into new departments.

The default departments db has also been updated for first-boot experience.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Needs Information
Revision history for this message
Paweł Stołowski (stolowski) wrote :

This is described in the README file of init-departments tools; I've added a pointer to HACKING.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:408
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/272/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/246
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/246

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/272/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:409
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/273/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/247
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/247/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/247

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/273/rebuild

review: Approve (continuous-integration)
Revision history for this message
dobey (dobey) wrote :

I think we should try to get the default db removed from version control as soon as possible. Also, having multiple READMEs in a single project is a bit weird. I'll file a bug for that though. And hopefully we can switch to API calls to the server to do this sort of updating, very soon, rather than having to create a bunch of SQL statements to update the db. But I'll approve this as is, given the current situation.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'HACKING'
--- HACKING 2014-05-16 21:08:36 +0000
+++ HACKING 2014-08-18 15:33:02 +0000
@@ -65,3 +65,8 @@
65 $ make coverage-html65 $ make coverage-html
6666
67The html will be left on the coveragereport directory.67The html will be left on the coveragereport directory.
68
69Updating departments db
70-----------------------
71See tools/init-departments/README for details about how to re-create departments database
72file found in data/departments.db.
6873
=== modified file 'data/departments.db'
69Binary files data/departments.db 2014-08-05 17:12:54 +0000 and data/departments.db 2014-08-18 15:33:02 +0000 differ74Binary files data/departments.db 2014-08-05 17:12:54 +0000 and data/departments.db 2014-08-18 15:33:02 +0000 differ
=== modified file 'data/update_schema.sh'
--- data/update_schema.sh 2014-08-06 17:31:50 +0000
+++ data/update_schema.sh 2014-08-18 15:33:02 +0000
@@ -52,4 +52,101 @@
52 UPDATE meta SET value='2' WHERE name='version';52 UPDATE meta SET value='2' WHERE name='version';
53 END TRANSACTION;53 END TRANSACTION;
54_UPDATE_TO_VER254_UPDATE_TO_VER2
55SCHEMA_VERSION=$(sqlite3 "$DBFILE" "SELECT value FROM meta WHERE name='version'")
56fi
57
58if [ "x$SCHEMA_VERSION" = "x2" ]
59then
60 sqlite3 "$DBFILE" << _UPDATE_TO_VER3
61 BEGIN TRANSACTION;
62 UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='3d';
63 UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='computing-robotics';
64 UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='debugging';
65 UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='electronics';
66 UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='engineering';
67 UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='ides';
68 UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='profiling';
69 UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='version-control';
70 UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='web-development';
71 UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='astronomy';
72 UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='biology';
73 UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='chemistry';
74 UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='geography';
75 UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='geology';
76 UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='mathematics';
77 UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='medicine';
78 UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='physics';
79 UPDATE pkgmap SET deptid='games' WHERE deptid='board-games';
80 UPDATE pkgmap SET deptid='games' WHERE deptid='card-games';
81 UPDATE pkgmap SET deptid='games' WHERE deptid='puzzles';
82 UPDATE pkgmap SET deptid='games' WHERE deptid='role-playing';
83 UPDATE pkgmap SET deptid='books-comics' WHERE deptid='books-magazines';
84 UPDATE pkgmap SET deptid='communication' WHERE deptid='chat';
85 UPDATE pkgmap SET deptid='communication' WHERE deptid='file-sharing';
86 UPDATE pkgmap SET deptid='communication' WHERE deptid='internet';
87 UPDATE pkgmap SET deptid='communication' WHERE deptid='mail';
88 UPDATE pkgmap SET deptid='communication' WHERE deptid='web-browsers';
89 UPDATE pkgmap SET deptid='graphics' WHERE deptid='drawing';
90 UPDATE pkgmap SET deptid='graphics' WHERE deptid='graphic-interface-design';
91 UPDATE pkgmap SET deptid='graphics' WHERE deptid='photography';
92 UPDATE pkgmap SET deptid='graphics' WHERE deptid='publishing';
93 UPDATE pkgmap SET deptid='graphics' WHERE deptid='scanning-ocr';
94 UPDATE pkgmap SET deptid='personalisation' WHERE deptid='localization';
95 UPDATE pkgmap SET deptid='personalisation' WHERE deptid='themes-tweaks';
96 UPDATE pkgmap SET deptid='productivity' WHERE deptid='office';
97 UPDATE pkgmap SET deptid='music-audio' WHERE deptid='sound-video';
98 UPDATE pkgmap SET deptid='universal-accessaccessibility' WHERE deptid='universal-access';
99 UPDATE pkgmap SET deptid='accessories' WHERE deptid='viewers';
100
101 DELETE FROM depts;
102 INSERT INTO depts (deptid,parentid) VALUES ('travel-local', '');
103 INSERT INTO depts (deptid,parentid) VALUES ('productivity', '');
104 INSERT INTO depts (deptid,parentid) VALUES ('finance', '');
105 INSERT INTO depts (deptid,parentid) VALUES ('universal-accessaccessibility', '');
106 INSERT INTO depts (deptid,parentid) VALUES ('entertainment', '');
107 INSERT INTO depts (deptid,parentid) VALUES ('communication', '');
108 INSERT INTO depts (deptid,parentid) VALUES ('graphics', '');
109 INSERT INTO depts (deptid,parentid) VALUES ('science-engineering', '');
110 INSERT INTO depts (deptid,parentid) VALUES ('news-magazines', '');
111 INSERT INTO depts (deptid,parentid) VALUES ('accessories', '');
112 INSERT INTO depts (deptid,parentid) VALUES ('sports', '');
113 INSERT INTO depts (deptid,parentid) VALUES ('developer-tools', '');
114 INSERT INTO depts (deptid,parentid) VALUES ('games', '');
115 INSERT INTO depts (deptid,parentid) VALUES ('books-comics', '');
116 INSERT INTO depts (deptid,parentid) VALUES ('music-audio', '');
117 INSERT INTO depts (deptid,parentid) VALUES ('shopping', '');
118 INSERT INTO depts (deptid,parentid) VALUES ('education', '');
119
120 DELETE FROM deptnames;
121 INSERT INTO deptnames (deptid,locale,name) VALUES ('books-comics','en_US','Books & Comics');
122 INSERT INTO deptnames (deptid,locale,name) VALUES ('business','en_US','Business');
123 INSERT INTO deptnames (deptid,locale,name) VALUES ('communication','en_US','Communication');
124 INSERT INTO deptnames (deptid,locale,name) VALUES ('developer-tools','en_US','Developer Tools');
125 INSERT INTO deptnames (deptid,locale,name) VALUES ('education','en_US','Education');
126 INSERT INTO deptnames (deptid,locale,name) VALUES ('entertainment','en_US','Entertainment');
127 INSERT INTO deptnames (deptid,locale,name) VALUES ('finance','en_US','Finance');
128 INSERT INTO deptnames (deptid,locale,name) VALUES ('food-drink','en_US','Food & Drink');
129 INSERT INTO deptnames (deptid,locale,name) VALUES ('games','en_US','Games');
130 INSERT INTO deptnames (deptid,locale,name) VALUES ('graphics','en_US','Graphics');
131 INSERT INTO deptnames (deptid,locale,name) VALUES ('health-fitness','en_US','Lifestyle');
132 INSERT INTO deptnames (deptid,locale,name) VALUES ('lifestyle','en_US','Health & Fitness');
133 INSERT INTO deptnames (deptid,locale,name) VALUES ('media-video','en_US','Media & Video');
134 INSERT INTO deptnames (deptid,locale,name) VALUES ('medical','en_US','Medical');
135 INSERT INTO deptnames (deptid,locale,name) VALUES ('music-audio','en_US','Music & Audio');
136 INSERT INTO deptnames (deptid,locale,name) VALUES ('news-magazines','en_US','News & Magazines');
137 INSERT INTO deptnames (deptid,locale,name) VALUES ('personalisation','en_US','Personalisation');
138 INSERT INTO deptnames (deptid,locale,name) VALUES ('productivity','en_US','Productivity');
139 INSERT INTO deptnames (deptid,locale,name) VALUES ('reference','en_US','Reference');
140 INSERT INTO deptnames (deptid,locale,name) VALUES ('science-engineering','en_US','Science & Engineering');
141 INSERT INTO deptnames (deptid,locale,name) VALUES ('shopping','en_US','Shopping');
142 INSERT INTO deptnames (deptid,locale,name) VALUES ('social-networking','en_US','Social Networking');
143 INSERT INTO deptnames (deptid,locale,name) VALUES ('sports','en_US','Sports');
144 INSERT INTO deptnames (deptid,locale,name) VALUES ('travel-local','en_US','Travel & Local');
145 INSERT INTO deptnames (deptid,locale,name) VALUES ('universal-accessaccessibility','en_US','Universal Access/Accessibility');
146 INSERT INTO deptnames (deptid,locale,name) VALUES ('weather','en_US','Weather');
147 INSERT INTO deptnames (deptid,locale,name) VALUES ('accessories','en_US','Utilities');
148
149 UPDATE meta SET value='3' WHERE name='version';
150 END TRANSACTION;
151_UPDATE_TO_VER3
55fi152fi
56153
=== modified file 'libclickscope/click/departments-db.cpp'
--- libclickscope/click/departments-db.cpp 2014-08-05 14:16:26 +0000
+++ libclickscope/click/departments-db.cpp 2014-08-18 15:33:02 +0000
@@ -150,7 +150,7 @@
150 //150 //
151 // note: this will fail due to unique constraint, but that's fine; it's expected to succeed only when new database is created; in other151 // note: this will fail due to unique constraint, but that's fine; it's expected to succeed only when new database is created; in other
152 // cases the version needs to be bumped in the update_schema.sh script.152 // cases the version needs to be bumped in the update_schema.sh script.
153 query.exec("INSERT INTO meta (name, value) VALUES ('version', 2)");153 query.exec("INSERT INTO meta (name, value) VALUES ('version', 3)");
154154
155 if (!db_.commit())155 if (!db_.commit())
156 {156 {

Subscribers

People subscribed via source and target branches

to all changes: