[Gforge-commits] gforge-plugin-scmsvn/bin db-upgrade.pl, 1.1.1.1, 1.2 svn_dump_update.pl, 1.2, 1.3

[cbayle]

Update of /cvsroot/gforge/gforge-plugin-scmsvn/bin
In directory db.perdue.net:/tmp/cvs-serv20883/bin

Modified Files:
        db-upgrade.pl svn_dump_update.pl 
Log Message:
Some corrections in svn, work in progress


Index: db-upgrade.pl
===================================================================
RCS file: /cvsroot/gforge/gforge-plugin-scmsvn/bin/db-upgrade.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- db-upgrade.pl       23 Sep 2004 21:08:18 -0000      1.1.1.1
+++ db-upgrade.pl       12 Dec 2004 23:50:46 -0000      1.2
@@ -46,21 +46,21 @@
     $version = &get_plugin_db_version ($dbh, $pluginname) ;
     $target = "0.1" ;
     if (&is_lesser ($version, $target)) {
-       my @filelist = ( 
"/usr/lib/gforge/plugins/$pluginname/lib/$pluginname-init.sql" ) ;
-       
-       foreach my $file (@filelist) {
-           &debug ("Processing $file") ;
-           @reqlist = @{ &parse_sql_file ($file) } ;
-           
-           foreach my $s (@reqlist) {
-               $query = $s ;
-               # &debug ($query) ;
-               $sth = $dbh->prepare ($query) ;
-               $sth->execute () ;
-               $sth->finish () ;
-           }
-       }
-       @reqlist = () ;
+#      my @filelist = ( 
"/usr/lib/gforge/plugins/$pluginname/lib/$pluginname-init.sql" ) ;
+#      
+#      foreach my $file (@filelist) {
+#          &debug ("Processing $file") ;
+#          @reqlist = @{ &parse_sql_file ($file) } ;
+#          
+#          foreach my $s (@reqlist) {
+#              $query = $s ;
+#              # &debug ($query) ;
+#              $sth = $dbh->prepare ($query) ;
+#              $sth->execute () ;
+#              $sth->finish () ;
+#          }
+#      }
+#      @reqlist = () ;
        
        &update_plugin_db_version ($dbh, $pluginname, $target) ;
        &debug ("Committing.") ;

Index: svn_dump_update.pl
===================================================================
RCS file: /cvsroot/gforge/gforge-plugin-scmsvn/bin/svn_dump_update.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- svn_dump_update.pl  29 Nov 2004 16:36:13 -0000      1.2
+++ svn_dump_update.pl  12 Dec 2004 23:50:46 -0000      1.3
@@ -27,12 +27,23 @@
 $c->finish () ;
 
 if($verbose) {print ("\nGetting group list");}
+#$query = "SELECT groups.group_id, unix_group_name, status
+#          FROM groups, group_plugin, plugin_scmsvn_group_usage
+#          WHERE groups.group_id = group_plugin.group_id
+#          AND group_plugin.plugin_id = $plugin_id
+#          AND plugin_scmsvn_group_usage.group_id = groups.group_id
+#          AND plugin_scmsvn_group_usage.svn_host = '$this_server'" ;
+
+#$query = "SELECT groups.group_id, unix_group_name, status
+#          FROM groups, group_plugin
+#          WHERE groups.group_id = group_plugin.group_id
+#          AND group_plugin.plugin_id = $plugin_id
+#          AND groups.scm_host = '$this_server'" ;
+
 $query = "SELECT groups.group_id, unix_group_name, status
-          FROM groups, group_plugin, plugin_scmsvn_group_usage
+          FROM groups, group_plugin
           WHERE groups.group_id = group_plugin.group_id
-          AND group_plugin.plugin_id = $plugin_id
-          AND plugin_scmsvn_group_usage.group_id = groups.group_id
-          AND plugin_scmsvn_group_usage.svn_host = '$this_server'" ;
+          AND group_plugin.plugin_id = $plugin_id";
 
 $c = $dbh->prepare($query);
 $c->execute();