diff options
Diffstat (limited to 'util')
-rwxr-xr-x | util/jsgen.pl | 3 | ||||
-rw-r--r-- | util/sql/schema.sql | 3 | ||||
-rw-r--r-- | util/updates/update_2.16.sql | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/util/jsgen.pl b/util/jsgen.pl index a2a7d7af..58b0ac9a 100755 --- a/util/jsgen.pl +++ b/util/jsgen.pl @@ -101,8 +101,7 @@ sub resolutions { sub jsgen { l10n_load(); my $common = ''; - $common .= sprintf "rlst_rstat = [ %s ];\n", join ', ', map qq{"$_"}, @{$S{rlst_rstat}}; - $common .= sprintf "rlst_vstat = [ %s ];\n", join ', ', map qq{"$_"}, @{$S{rlst_vstat}}; + $common .= sprintf "rlist_status = [ %s ];\n", join ', ', map qq{"$_"}, @{$S{rlist_status}}; $common .= sprintf "cookie_prefix = '%s';\n", $S{cookie_prefix}; $common .= sprintf "age_ratings = [ %s ];\n", join ',', @{$S{age_ratings}}; $common .= sprintf "languages = [ %s ];\n", join ', ', map qq{"$_"}, @{$S{languages}}; diff --git a/util/sql/schema.sql b/util/sql/schema.sql index 2ea03f4a..4daa2f1c 100644 --- a/util/sql/schema.sql +++ b/util/sql/schema.sql @@ -156,8 +156,7 @@ CREATE TABLE relgraphs ( CREATE TABLE rlists ( uid integer NOT NULL DEFAULT 0, rid integer NOT NULL DEFAULT 0, - vstat smallint NOT NULL DEFAULT 0, - rstat smallint NOT NULL DEFAULT 0, + status smallint NOT NULL DEFAULT 0, added timestamptz NOT NULL DEFAULT NOW(), PRIMARY KEY(uid, rid) ); diff --git a/util/updates/update_2.16.sql b/util/updates/update_2.16.sql index 580be925..07050734 100644 --- a/util/updates/update_2.16.sql +++ b/util/updates/update_2.16.sql @@ -42,3 +42,7 @@ INSERT INTO vnlists SELECT CREATE CONSTRAINT TRIGGER update_vnlist_rlist AFTER DELETE ON vnlists DEFERRABLE FOR EACH ROW EXECUTE PROCEDURE update_vnlist_rlist(); CREATE CONSTRAINT TRIGGER update_vnlist_rlist AFTER INSERT ON rlists DEFERRABLE FOR EACH ROW EXECUTE PROCEDURE update_vnlist_rlist(); +-- remove rlists.vstat and rename rlists.rstat +ALTER TABLE rlists DROP COLUMN vstat; +ALTER TABLE rlists RENAME COLUMN rstat TO status; + |