nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-01 16:11:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure that a perl is not connected when we apply a patch.

Browse Source
This commit is contained in:
Andrew McMillan 2007-05-28 15:53:14 +12:00
parent f2023b82fd
commit d609d6bfeb
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dba/update-rscds-database
View File

@ -41,7 +41,6 @@ show_usage() if ( $helpmeplease );
my $dsn = "dbi:Pg:dbname=$dbname"; my $dsn = "dbi:Pg:dbname=$dbname";
$dsn .= ";host=$dbhost" if ( "$dbhost" ne "" ); $dsn .= ";host=$dbhost" if ( "$dbhost" ne "" );
$dsn .= ";port=$dbport" if ( $dbport != 5432 ); $dsn .= ";port=$dbport" if ( $dbport != 5432 );
my $dbh = DBI->connect($dsn, $dbuser, $dbpass, { AutoCommit => 0 } ) or die "Can't connect to database $dbname";
my $current_revision = get_current_revision(); my $current_revision = get_current_revision();
printf( "The database is currently at revision %d.%d.%d.\n", $current_revision->{'schema_major'}, $current_revision->{'schema_minor'}, $current_revision->{'schema_patch'} ); printf( "The database is currently at revision %d.%d.%d.\n", $current_revision->{'schema_major'}, $current_revision->{'schema_minor'}, $current_revision->{'schema_patch'} );
@ -135,16 +134,22 @@ sub compare_revisions {
############################################################ ############################################################
sub get_current_revision { sub get_current_revision {
my $dbh = DBI->connect($dsn, $dbuser, $dbpass, { AutoCommit => 0 } ) or die "Can't connect to database $dbname";
my $current_revision = $dbh->prepare( <<EOQ ) or die $dbh->errstr; my $current_revision = $dbh->prepare( <<EOQ ) or die $dbh->errstr;
SELECT schema_major, schema_minor, schema_patch FROM awl_db_revision ORDER BY schema_id DESC LIMIT 1 SELECT schema_major, schema_minor, schema_patch FROM awl_db_revision ORDER BY schema_id DESC LIMIT 1
EOQ EOQ
if ( $current_revision->execute() ) { if ( $current_revision->execute() ) {
return $current_revision->fetchrow_hashref(); my $revision = $current_revision->fetchrow_hashref();
undef $current_revision;
$dbh->disconnect;
return $revision;
} }
else { else {
die "ERROR: Cannot read current revision from database."; die "ERROR: Cannot read current revision from database.";
} }
} }
@ -160,7 +165,7 @@ sub apply_patch {
$current_revision = get_current_revision(); $current_revision = get_current_revision();
if ( compare_revisions($current_revision,revision_hash($patch)) != 0 ) { if ( compare_revisions($current_revision,revision_hash($patch)) != 0 ) {
printf( "Failed to apply revision %d.%d.%d to the database!\n", $patch->{'schema_major'}, $patch->{'schema_minor'}, $patch->{'schema_patch'} ); printf( "Failed to apply revision %s to the database!\n", $patch );
return 0; return 0;
} }
return 1; # Success return 1; # Success
@ -182,8 +187,12 @@ sub apply_sql_file {
push @psql_opts, "-U", $dbuser if ( $dbuser ne "" ); push @psql_opts, "-U", $dbuser if ( $dbuser ne "" );
$ENV{'PGPASS'} = $dbpass if ( $dbpass ne "" ); $ENV{'PGPASS'} = $dbpass if ( $dbpass ne "" );
system( @psql_opts ); my $command = join ' ', @psql_opts;
my $results = `$command 2>&1 1>/dev/null`;
$results =~ s/^.*WARNING: there is no transaction in progress\s$//m;
print $results;
} }