Index: openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl 4 Jun 2006 00:45:22 -0000 1.6 +++ openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl 13 Nov 2006 21:31:58 -0000 1.7 @@ -30,7 +30,7 @@ # sticks and fire... set db [ns_db gethandle [lindex [db_available_pools {}] 0]] set selection [ns_db 1row $db "select version from product_component_version where product like 'Oracle%'"] - regexp {^[0-9]\.[0-9]\.[0-9]} [ns_set value $selection 0] match + regexp {^[0-9]+\.[0-9]+\.[0-9]+} [ns_set value $selection 0] match ns_db releasehandle $db nsv_set ad_database_version . $match } Index: openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl,v diff -u -N -r1.38 -r1.39 --- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 1 Mar 2005 00:01:22 -0000 1.38 +++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 13 Nov 2006 21:31:59 -0000 1.39 @@ -103,12 +103,13 @@ # If the query being tested was written for a version that is older than # the current RDBMS then we have compatibility. Otherwise we don't. - if {[db_rdbms_get_version $rdbms_test] <= [db_rdbms_get_version $rdbms_pattern]} { - return 1 - } - - # db_qd_log QDDebug "compatibility - version numbers are bad!" - return 0 + foreach t [split [db_rdbms_get_version $rdbms_test ] "\."] \ + p [split [db_rdbms_get_version $rdbms_pattern] "\."] { + if {$t != $p} {return [expr $t < $p]} + } + + # Same version (though not strictly "older") is OK + return 1 }