Merge lp:~ivaldi/midori/dbupdate into lp:~kalikiana/midori/dbupdate

Proposed by André Stösel
Status: Merged
Merged at revision: 6406
Proposed branch: lp:~ivaldi/midori/dbupdate
Merge into: lp:~kalikiana/midori/dbupdate
Diff against target: 55 lines (+6/-6)
3 files modified
data/forms/Create.sql (+1/-1)
data/history/Create.sql (+2/-2)
data/tabby/Create.sql (+3/-3)
To merge this branch: bzr merge lp:~ivaldi/midori/dbupdate
Reviewer Review Type Date Requested Status
Cris Dywan Pending
Review via email: mp+186358@code.launchpad.net

Commit message

fix Create.sql to avoid errors if the db already exists

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
1=== modified file 'data/forms/Create.sql'
2--- data/forms/Create.sql 2013-09-17 23:39:10 +0000
3+++ data/forms/Create.sql 2013-09-18 15:25:52 +0000
4@@ -1,4 +1,4 @@
5-CREATE TABLE forms
6+CREATE TABLE IF NOT EXISTS forms
7 (
8 domain text,
9 field text,
10
11=== modified file 'data/history/Create.sql'
12--- data/history/Create.sql 2013-09-17 23:39:10 +0000
13+++ data/history/Create.sql 2013-09-18 15:25:52 +0000
14@@ -1,11 +1,11 @@
15-CREATE TABLE history
16+CREATE TABLE IF NOT EXISTS history
17 (
18 uri text,
19 title text,
20 date integer,
21 day integer
22 );
23-CREATE TABLE search
24+CREATE TABLE IF NOT EXISTS search
25 (
26 keywords text,
27 uri text,
28
29=== modified file 'data/tabby/Create.sql'
30--- data/tabby/Create.sql 2013-09-17 23:39:10 +0000
31+++ data/tabby/Create.sql 2013-09-18 15:25:52 +0000
32@@ -1,4 +1,4 @@
33-CREATE TABLE sessions
34+CREATE TABLE IF NOT EXISTS sessions
35 (
36 id INTEGER PRIMARY KEY,
37 parent_id INTEGER DEFAULT 0,
38@@ -9,7 +9,7 @@
39 FOREIGN KEY(parent_id) REFERENCES sessions(id)
40 );
41
42-CREATE TABLE tabs
43+CREATE TABLE IF NOT EXISTS tabs
44 (
45 id INTEGER PRIMARY KEY,
46 session_id INTEGER NOT NULL,
47@@ -22,7 +22,7 @@
48 FOREIGN KEY(session_id) REFERENCES sessions(id)
49 );
50
51-CREATE TABLE tab_history
52+CREATE TABLE IF NOT EXISTS tab_history
53 (
54 id INTEGER PRIMARY KEY,
55 tab_id INTEGER,

Subscribers

People subscribed via source and target branches

to all changes: