SQL: Renamed vn_graphs to relgraphs and synced dbgraph.pl

As the same table can easily be used to store producer relation graphs
as well.

6 files changed, 15 insertions, 19 deletions

diff --git a/lib/Multi/Maintenance.pm b/lib/Multi/Maintenance.pm
index 59d30ce6..ecc80486 100644
--- a/lib/Multi/Maintenance.pm
+++ b/lib/Multi/Maintenance.pm
@@ -119,7 +119,7 @@ sub vnpopularity {
 
 sub cleangraphs {
   # should be pretty fast
-  $_[KERNEL]->post(pg => do => 'DELETE FROM vn_graphs vg WHERE NOT EXISTS(SELECT 1 FROM vn WHERE rgraph = vg.id)',
+  $_[KERNEL]->post(pg => do => 'DELETE FROM relgraphs vg WHERE NOT EXISTS(SELECT 1 FROM vn WHERE rgraph = vg.id)',
     undef, 'log_stats', 'cleangraphs');
 }
 
diff --git a/lib/Multi/RG.pm b/lib/Multi/RG.pm
index 1ee69911..5cb03ed4 100644
--- a/lib/Multi/RG.pm
+++ b/lib/Multi/RG.pm
@@ -220,7 +220,7 @@ sub savegraph {
   $w->end();
 
   # save the processed SVG in the database and fetch graph ID
-  $_[KERNEL]->post(pg => query => 'INSERT INTO vn_graphs (svg) VALUES (?) RETURNING id', [ $svg ], 'finish');
+  $_[KERNEL]->post(pg => query => 'INSERT INTO relgraphs (svg) VALUES (?) RETURNING id', [ $svg ], 'finish');
 }
 
 
diff --git a/lib/VNDB/DB/VN.pm b/lib/VNDB/DB/VN.pm
index 662057d5..bb2c1275 100644
--- a/lib/VNDB/DB/VN.pm
+++ b/lib/VNDB/DB/VN.pm
@@ -77,7 +77,7 @@ sub dbVNGet {
     $o{what} =~ /changes/ ?
       'JOIN users u ON u.id = c.requester' : (),
     $o{what} =~ /relgraph/ ?
-      'JOIN vn_graphs vg ON vg.id = v.rgraph' : (),
+      'JOIN relgraphs vg ON vg.id = v.rgraph' : (),
   );
 
   my $tag_ids = $o{tags_include} && join ',', @{$o{tags_include}[1]};
diff --git a/util/dbgraph.pl b/util/dbgraph.pl
index 51e7302e..0b72ceba 100755
--- a/util/dbgraph.pl
+++ b/util/dbgraph.pl
@@ -16,13 +16,13 @@ use warnings;
 
 
 my %subgraphs = (
-  'Producers'        => [qw| FFFFCC producers producers_rev |],
+  'Producers'        => [qw| FFFFCC producers producers_rev producers_relations |],
   'Releases'         => [qw| C8FFC8 releases releases_rev releases_media releases_platforms releases_producers releases_lang releases_vn |],
-  'Visual Novels'    => [qw| FFE6BE vn vn_rev vn_relations vn_anime vn_screenshots vn_graphs |],
+  'Visual Novels'    => [qw| FFE6BE vn vn_rev vn_relations vn_anime vn_screenshots |],
   'Users'            => [qw| CCFFFF users votes rlists wlists sessions |],
   'Discussion board' => [qw| FFDCDC threads threads_boards threads_posts |],
   'Tags'             => [qw| FFC8C8 tags tags_aliases tags_parents tags_vn |],
-  'Misc'             => [qw| F5F5F5 changes anime screenshots stats_cache quotes |],
+  'Misc'             => [qw| F5F5F5 changes anime screenshots stats_cache quotes relgraphs |],
 );
 
 my %tables; # table_name => [ [ col1, pri ], ... ]
diff --git a/util/dump.sql b/util/dump.sql
index f5ce2614..97d317e0 100644
--- a/util/dump.sql
+++ b/util/dump.sql
@@ -50,7 +50,6 @@ CREATE TABLE producers (
   hidden boolean NOT NULL DEFAULT FALSE
 );
 
-
 -- producers_relations
 CREATE TABLE producers_relations (
   pid1 integer NOT NULL,
@@ -59,7 +58,6 @@ CREATE TABLE producers_relations (
   PRIMARY KEY(pid1, pid2)
 );
 
-
 -- producers_rev
 CREATE TABLE producers_rev (
   id integer NOT NULL PRIMARY KEY,
@@ -73,7 +71,6 @@ CREATE TABLE producers_rev (
   alias varchar(500) NOT NULL DEFAULT ''
 );
 
-
 -- quotes
 CREATE TABLE quotes (
   vid integer NOT NULL,
@@ -81,7 +78,6 @@ CREATE TABLE quotes (
   PRIMARY KEY(vid, quote)
 );
 
-
 -- releases
 CREATE TABLE releases (
   id SERIAL NOT NULL PRIMARY KEY,
@@ -151,6 +147,12 @@ CREATE TABLE releases_vn (
   PRIMARY KEY(rid, vid)
 );
 
+-- relgraphs
+CREATE TABLE relgraphs (
+  id SERIAL PRIMARY KEY,
+  svg xml NOT NULL
+);
+
 -- rlists
 CREATE TABLE rlists (
   uid integer NOT NULL DEFAULT 0,
@@ -297,12 +299,6 @@ CREATE TABLE vn_anime (
   PRIMARY KEY(vid, aid)
 );
 
--- vn_graphs
-CREATE TABLE vn_graphs (
-  id SERIAL PRIMARY KEY,
-  svg xml NOT NULL
-);
-
 -- vn_relations
 CREATE TABLE vn_relations (
   vid1 integer NOT NULL DEFAULT 0,
@@ -397,7 +393,7 @@ ALTER TABLE threads_posts      ADD FOREIGN KEY (tid)       REFERENCES threads
 ALTER TABLE threads_posts      ADD FOREIGN KEY (uid)       REFERENCES users         (id);
 ALTER TABLE threads_boards     ADD FOREIGN KEY (tid)       REFERENCES threads       (id);
 ALTER TABLE vn                 ADD FOREIGN KEY (latest)    REFERENCES vn_rev        (id) DEFERRABLE INITIALLY DEFERRED;
-ALTER TABLE vn                 ADD FOREIGN KEY (rgraph)    REFERENCES vn_graphs     (id);
+ALTER TABLE vn                 ADD FOREIGN KEY (rgraph)    REFERENCES relgraphs     (id);
 ALTER TABLE vn_anime           ADD FOREIGN KEY (aid)       REFERENCES anime         (id);
 ALTER TABLE vn_anime           ADD FOREIGN KEY (vid)       REFERENCES vn_rev        (id);
 ALTER TABLE vn_relations       ADD FOREIGN KEY (vid1)      REFERENCES vn_rev        (id);
diff --git a/util/updates/update_2.8.sql b/util/updates/update_2.8.sql
index 9d79500a..aef84791 100644
--- a/util/updates/update_2.8.sql
+++ b/util/updates/update_2.8.sql
@@ -8,11 +8,11 @@
 UPDATE vn SET rgraph = NULL;
 ALTER TABLE vn DROP CONSTRAINT vn_rgraph_fkey;
 DROP TABLE relgraph;
-CREATE TABLE vn_graphs (
+CREATE TABLE relgraphs (
   id SERIAL PRIMARY KEY,
   svg xml NOT NULL
 );
-ALTER TABLE vn ADD FOREIGN KEY (rgraph) REFERENCES vn_graphs (id);
+ALTER TABLE vn ADD FOREIGN KEY (rgraph) REFERENCES relgraphs (id);
 
 
 -- VN relations stored as enum