diff options
Diffstat (limited to 'util')
-rwxr-xr-x | util/dbdump.pl | 3 | ||||
-rwxr-xr-x | util/devdump.pl | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/util/dbdump.pl b/util/dbdump.pl index 5adf35de..f749ed72 100755 --- a/util/dbdump.pl +++ b/util/dbdump.pl @@ -305,6 +305,7 @@ sub export_data { binmode($F, ":utf8"); select $F; print "\\set ON_ERROR_STOP 1\n"; + print "\\i sql/util.sql\n"; print "\\i sql/schema.sql\n"; # Would be nice if VNDB::Schema could list sequences, too. my @seq = sort @{ $db->selectcol_arrayref( @@ -312,7 +313,7 @@ sub export_data { ) }; printf "SELECT setval('%s', %d);\n", $_, $db->selectrow_array("SELECT last_value FROM \"$_\"", {}) for @seq; for my $t (sort { $a->{name} cmp $b->{name} } values %$schema) { - my $cols = join ',', map "\"$_->{name}\"", $t->{cols}->@*; + my $cols = join ',', map "\"$_->{name}\"", grep $_->{decl} !~ /\sGENERATED\s/, $t->{cols}->@*; my $order = table_order $t->{name}; print "\nCOPY \"$t->{name}\" ($cols) FROM STDIN;\n"; $db->do("COPY (SELECT $cols FROM \"$t->{name}\" $order) TO STDOUT"); diff --git a/util/devdump.pl b/util/devdump.pl index a36d0184..1cc54ea0 100755 --- a/util/devdump.pl +++ b/util/devdump.pl @@ -96,6 +96,7 @@ sub copy_entry { print "-- This file replaces 'sql/all.sql'.\n"; print "\\set ON_ERROR_STOP 1\n"; + print "\\i sql/util.sql\n"; print "\\i sql/schema.sql\n"; print "\\i sql/data.sql\n"; print "\\i sql/func.sql\n"; |