nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-07-13 10:40:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix thinko.

Browse Source
This commit is contained in:
Andrew McMillan 2006-11-15 17:51:12 +13:00
parent 585aabe791
commit 61b8f90b5d
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dba/update-rscds-database
View File

@ -19,6 +19,11 @@ my $dbpass = "";
my $dbhost = "";
my $helpmeplease = 0;
my $dbadir = $0;
$dbadir =~ s#/[^/]*$##;
my $patchdir = $dbadir . "/patches";
GetOptions ('debug!' => \$debug,
'dbname=s' => \$dbname,
'dbuser=s' => \$dbuser,
@ -34,16 +39,13 @@ show_usage() if ( $helpmeplease );
# environment variables will also work with DBD::Pg.
############################################################
my $dsn = "dbi:Pg:dbname=$dbname";
$dsn .= ";host=$dbhost" if ( "$dbhost" eq "" );
$dsn .= ";host=$dbhost" if ( "$dbhost" ne "" );
$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();
printf( "The database is currently at revision %d.%d.%d.\n", $current_revision->{'schema_major'}, $current_revision->{'schema_minor'}, $current_revision->{'schema_patch'} );
my $patchdir = $0;
$patchdir =~ s#/[^/]*$#/patches#;
opendir( PATCHDIR, $patchdir ) or die "Can't open patch directory $patchdir";
my @patches = grep { /^([0-9]+)\.([0-9]+)\.([0-9]+)\.sql$/ } readdir(PATCHDIR);
closedir(PATCHDIR);
@ -71,6 +73,14 @@ else {
print "No patches were applied.\n";
}
# Ensure the locales data is up to date
apply_sql_file( $dbadir, "supported_locales.sql" );
print "Supported locales updated.\n";
# Ensure the functions are up to date
apply_sql_file( $dbadir, "caldav_functions.sql" );
print "CalDAV functions updated.\n";
# The End!
exit 0;
@ -140,20 +150,13 @@ EOQ
############################################################
# Apply Patch
# Apply a DB Patch File
############################################################
sub apply_patch {
my $patch = shift;
# my @psql_opts = ( "psql", "-q", "-f", sprintf( "%s/%d.%d.%d.sql", $patchdir, $patch->{'schema_major'}, $patch->{'schema_minor'}, $patch->{'schema_patch'} ), $dbname );
my @psql_opts = ( "psql", "-q", "-f", $patchdir."/".$patch, $dbname );
push @psql_opts, "-h", $dbhost if ( $dbhost ne "" );
push @psql_opts, "-p", "$dbport" if ( $dbport != 5432 );
push @psql_opts, "-U", $dbuser if ( $dbuser ne "" );
$ENV{'PGPASS'} = $dbpass if ( $dbpass ne "" );
system( @psql_opts );
apply_sql_file( $patchdir, $patch );
$current_revision = get_current_revision();
if ( compare_revisions($current_revision,revision_hash($patch)) != 0 ) {
@ -165,6 +168,25 @@ sub apply_patch {
############################################################
# Apply SQL File
############################################################
sub apply_sql_file {
my $sqldir = shift;
my $sqlfile = shift;
my @psql_opts = ( "psql", "-q", "-f", $sqldir."/".$sqlfile, $dbname );
push @psql_opts, "-h", $dbhost if ( $dbhost ne "" );
push @psql_opts, "-p", "$dbport" if ( $dbport != 5432 );
push @psql_opts, "-U", $dbuser if ( $dbuser ne "" );
$ENV{'PGPASS'} = $dbpass if ( $dbpass ne "" );
system( @psql_opts );
}
############################################################
# Tell the nice user how we do things. Short and sweet.
############################################################