Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql	9 May 2001 22:32:25 -0000	1.3
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql	30 Aug 2002 11:48:46 -0000	1.4
@@ -223,7 +223,7 @@
 </fullquery>
 
  
-<fullquery name="apm_upgrade_script_compare.test">      
+<fullquery name="apm_upgrade_script_compare.test_f1">      
       <querytext>
       
 	    begin
@@ -234,11 +234,11 @@
 </fullquery>
 
  
-<fullquery name="apm_upgrade_script_compare.test">      
+<fullquery name="apm_upgrade_script_compare.test_f2">      
       <querytext>
       
 	    begin
-	    :1 := apm_package_version.sortable_version_name('$f1_version_from');
+	    :1 := apm_package_version.sortable_version_name('$f2_version_from');
 	    end;
 	
       </querytext>
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql	9 May 2001 22:32:25 -0000	1.8
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql	30 Aug 2002 11:48:47 -0000	1.9
@@ -203,7 +203,7 @@
 </fullquery>
 
  
-<fullquery name="apm_upgrade_script_compare.test">      
+<fullquery name="apm_upgrade_script_compare.test_f1">      
       <querytext>
 
 	    select apm_package_version__sortable_version_name('$f1_version_from');
@@ -212,10 +212,10 @@
 </fullquery>
 
  
-<fullquery name="apm_upgrade_script_compare.test">      
+<fullquery name="apm_upgrade_script_compare.test_f2">      
       <querytext>
 
-	    select apm_package_version__sortable_version_name('$f1_version_from');
+	    select apm_package_version__sortable_version_name('$f2_version_from');
 	
       </querytext>
 </fullquery>
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	14 Aug 2002 18:57:56 -0000	1.14
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	30 Aug 2002 11:48:47 -0000	1.15
@@ -1102,16 +1102,8 @@
     [regexp {\-(.*)-.*.sql} $f2 match f2_version_from]} {
 	# At this point we should have something like 2.0 and 3.1d which Tcl string
 	# comparison can handle. 
-	set f1_version_from [db_exec_plsql test "
-	    begin
-	    :1 := apm_package_version.sortable_version_name('$f1_version_from');
-	    end;
-	"]
-	set f2_version_from [db_exec_plsql test "
-	    begin
-	    :1 := apm_package_version.sortable_version_name('$f2_version_from');
-	    end;
-	"]
+	set f1_version_from [db_exec_plsql test_f1 {}]
+	set f2_version_from [db_exec_plsql test_f2 {}]
 	return [string compare $f1_version_from $f2_version_from]
     } else {
 	error "Invalid upgrade script syntax.  Should be \"upgrade-major.minor-major.minor.sql\"."