From 61b8f90b5d50249d9bac90fb43d3a3c290779fef Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Wed, 15 Nov 2006 17:51:12 +1300
Subject: [PATCH] Fix thinko.

---
 dba/update-rscds-database | 48 ++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/dba/update-rscds-database b/dba/update-rscds-database
index b267550b..50770eaf 100755
--- a/dba/update-rscds-database
+++ b/dba/update-rscds-database
@@ -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.
 ############################################################