lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #779 from knl/there-is-no-hydra-postgresql.sql-anymore

Browse source 
Remove references to hydra-postgresql.sql
This commit is contained in:
Eelco Dolstra 2020-06-05 17:21:40 +02:00 committed by GitHub
parent c0b4686b32 3acdd21569
commit 5f1faf4cb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/script/hydra-init
View file

@ -25,7 +25,7 @@ my @tables = $dbh->tables;
if (! grep { /SchemaVersion/i } @tables) { if (! grep { /SchemaVersion/i } @tables) {
print STDERR "initialising the Hydra database schema...\n"; print STDERR "initialising the Hydra database schema...\n";
my $schema = read_file( my $schema = read_file(
$dbh->{Driver}->{Name} eq 'Pg' ? "$home/sql/hydra-postgresql.sql" : $dbh->{Driver}->{Name} eq 'Pg' ? "$home/sql/hydra.sql" :
die "unsupported database type $dbh->{Driver}->{Name}\n"); die "unsupported database type $dbh->{Driver}->{Name}\n");
my @statements = $sql_splitter->split($schema); my @statements = $sql_splitter->split($schema);
eval { eval {

6
src/sql/Makefile.am
View file

@ -1,13 +1,9 @@
sqldir = $(libexecdir)/hydra/sql sqldir = $(libexecdir)/hydra/sql
nobase_dist_sql_DATA = \ nobase_dist_sql_DATA = \
hydra-postgresql.sql \
hydra.sql \ hydra.sql \
test.sql \ test.sql \
upgrade-*.sql \ upgrade-*.sql \
update-dbix.pl update-dbix.pl
hydra-postgresql.sql: hydra.sql update-dbix: hydra.sql
cpp -P -E -traditional-cpp -DPOSTGRESQL hydra.sql > $@ || rm -f $@
update-dbix: hydra-postgresql.sql
./update-dbix-harness.sh ./update-dbix-harness.sh

2
src/sql/update-dbix-harness.sh
View file

@ -33,7 +33,7 @@ pg_ctl -D "$data" \
createdb -h "$socket" "$dbname" createdb -h "$socket" "$dbname"
psql -h "$socket" "$dbname" -f ./hydra-postgresql.sql psql -h "$socket" "$dbname" -f ./hydra.sql
perl -I ../lib \ perl -I ../lib \
-MDBIx::Class::Schema::Loader=make_schema_at,dump_to_dir:../lib \ -MDBIx::Class::Schema::Loader=make_schema_at,dump_to_dir:../lib \