first pass of merging in warp (doesn't build)
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
ALTER TABLE tabs DROP COLUMN tab_group_id;
|
||||
DROP TABLE tab_groups;
|
||||
@@ -0,0 +1,10 @@
|
||||
CREATE TABLE tab_groups (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
window_id INTEGER NOT NULL,
|
||||
name TEXT,
|
||||
color TEXT,
|
||||
collapsed BOOLEAN NOT NULL,
|
||||
FOREIGN KEY(window_id) REFERENCES windows(id)
|
||||
);
|
||||
|
||||
ALTER TABLE tabs ADD COLUMN tab_group_id INTEGER REFERENCES tab_groups(id);
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
ALTER TABLE tab_groups DROP COLUMN pinned;
|
||||
ALTER TABLE tabs DROP COLUMN pinned;
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
ALTER TABLE tabs ADD COLUMN pinned BOOLEAN NOT NULL DEFAULT FALSE;
|
||||
ALTER TABLE tab_groups ADD COLUMN pinned BOOLEAN NOT NULL DEFAULT FALSE;
|
||||
@@ -0,0 +1,6 @@
|
||||
CREATE TABLE welcome_panes (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
kind TEXT NOT NULL DEFAULT 'welcome' CHECK (kind = 'welcome'),
|
||||
startup_directory TEXT,
|
||||
FOREIGN KEY (id, kind) REFERENCES pane_leaves (pane_node_id, kind)
|
||||
);
|
||||
@@ -0,0 +1,13 @@
|
||||
-- Drop the welcome_panes table first to remove the FK constraint that
|
||||
-- references pane_leaves, so we can then clean up the pane_leaves rows.
|
||||
DROP TABLE IF EXISTS welcome_panes;
|
||||
|
||||
-- Delete pane_leaves rows for welcome panes. These would otherwise cause
|
||||
-- "Unrecognized pane kind: welcome" errors in read_node during restoration.
|
||||
DELETE FROM pane_leaves WHERE kind = 'welcome';
|
||||
|
||||
-- Delete the now-orphaned leaf pane_nodes (those with no corresponding
|
||||
-- pane_leaves row).
|
||||
DELETE FROM pane_nodes
|
||||
WHERE is_leaf = 1
|
||||
AND id NOT IN (SELECT pane_node_id FROM pane_leaves);
|
||||
Reference in New Issue
Block a user