From 158825be34b6987c18fcdf80da4d05aee5900be6 Mon Sep 17 00:00:00 2001
From: Yorhel <git@yorhel.nl>
Date: Tue, 17 Sep 2019 11:45:42 +0200
Subject: Rename VNDBSchema to VNDB::Schema and let it figure out the root path
 itself

I always avoided using the VNDB::* schema for non-web related utility
modules, but thats pretty silly (especially as I'm slowly trying to move
away from the old VNDB::* web code).
---
 util/dbdump.pl      | 8 ++++----
 util/sql/schema.sql | 2 +-
 util/sqleditfunc.pl | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'util')

diff --git a/util/dbdump.pl b/util/dbdump.pl
index d513c989..f90cce8b 100755
--- a/util/dbdump.pl
+++ b/util/dbdump.pl
@@ -34,7 +34,7 @@ our $ROOT;
 BEGIN { ($ROOT = abs_path $0) =~ s{/util/dbdump\.pl$}{}; }
 
 use lib "$ROOT/lib";
-use VNDBSchema;
+use VNDB::Schema;
 
 
 # Tables and columns to export.
@@ -99,9 +99,9 @@ my %tables = (
 );
 
 my @tables = map +{ name => $_, %{$tables{$_}} }, sort keys %tables;
-my $schema = VNDBSchema::schema("$ROOT/util/sql/schema.sql");
-my $types = VNDBSchema::types("$ROOT/util/sql/schema.sql");
-my $references = VNDBSchema::references("$ROOT/util/sql/tableattrs.sql");
+my $schema = VNDB::Schema::schema;
+my $types = VNDB::Schema::types;
+my $references = VNDB::Schema::references;
 
 my $db = DBI->connect('dbi:Pg:dbname=vndb', 'vndb', undef, { RaiseError => 1 });
 $db->do('SET TIME ZONE +0');
diff --git a/util/sql/schema.sql b/util/sql/schema.sql
index 57f33efc..1450196a 100644
--- a/util/sql/schema.sql
+++ b/util/sql/schema.sql
@@ -40,7 +40,7 @@
 -- defined in util/dbdump.pl.
 --
 -- Note: Every CREATE TABLE clause and each column should be on a separate
--- line. This file is parsed by lib/VNDBSchema.pm and it doesn't implement a
+-- line. This file is parsed by lib/VNDB/Schema.pm and it doesn't implement a
 -- full SQL query parser.
 
 
diff --git a/util/sqleditfunc.pl b/util/sqleditfunc.pl
index 0d1749a2..3375136a 100755
--- a/util/sqleditfunc.pl
+++ b/util/sqleditfunc.pl
@@ -9,9 +9,9 @@ our $ROOT;
 BEGIN { ($ROOT = abs_path $0) =~ s{/util/sqleditfunc\.pl$}{}; }
 
 use lib "$ROOT/lib";
-use VNDBSchema;
+use VNDB::Schema;
 
-my $schema = VNDBSchema::schema("$ROOT/util/sql/schema.sql");
+my $schema = VNDB::Schema::schema;
 my $template = join '', <DATA>;
 
 sub gensql {
-- 
cgit v1.2.3