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
=== modified file 'data/forms/Create.sql'
--- data/forms/Create.sql 2013-09-17 23:39:10 +0000
+++ data/forms/Create.sql 2013-09-18 15:25:52 +0000
@@ -1,4 +1,4 @@
1CREATE TABLE forms1CREATE TABLE IF NOT EXISTS forms
2(2(
3 domain text,3 domain text,
4 field text,4 field text,
55
=== modified file 'data/history/Create.sql'
--- data/history/Create.sql 2013-09-17 23:39:10 +0000
+++ data/history/Create.sql 2013-09-18 15:25:52 +0000
@@ -1,11 +1,11 @@
1CREATE TABLE history1CREATE TABLE IF NOT EXISTS history
2(2(
3 uri text,3 uri text,
4 title text,4 title text,
5 date integer,5 date integer,
6 day integer6 day integer
7);7);
8CREATE TABLE search8CREATE TABLE IF NOT EXISTS search
9(9(
10 keywords text,10 keywords text,
11 uri text,11 uri text,
1212
=== modified file 'data/tabby/Create.sql'
--- data/tabby/Create.sql 2013-09-17 23:39:10 +0000
+++ data/tabby/Create.sql 2013-09-18 15:25:52 +0000
@@ -1,4 +1,4 @@
1CREATE TABLE sessions1CREATE TABLE IF NOT EXISTS sessions
2(2(
3 id INTEGER PRIMARY KEY,3 id INTEGER PRIMARY KEY,
4 parent_id INTEGER DEFAULT 0,4 parent_id INTEGER DEFAULT 0,
@@ -9,7 +9,7 @@
9 FOREIGN KEY(parent_id) REFERENCES sessions(id)9 FOREIGN KEY(parent_id) REFERENCES sessions(id)
10);10);
1111
12CREATE TABLE tabs12CREATE TABLE IF NOT EXISTS tabs
13(13(
14 id INTEGER PRIMARY KEY,14 id INTEGER PRIMARY KEY,
15 session_id INTEGER NOT NULL,15 session_id INTEGER NOT NULL,
@@ -22,7 +22,7 @@
22 FOREIGN KEY(session_id) REFERENCES sessions(id)22 FOREIGN KEY(session_id) REFERENCES sessions(id)
23);23);
2424
25CREATE TABLE tab_history25CREATE TABLE IF NOT EXISTS tab_history
26(26(
27 id INTEGER PRIMARY KEY,27 id INTEGER PRIMARY KEY,
28 tab_id INTEGER,28 tab_id INTEGER,

Subscribers

People subscribed via source and target branches

to all changes: