Index: openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl 29 Oct 2003 10:12:41 -0000 1.6 +++ openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl 14 Apr 2005 17:33:38 -0000 1.7 @@ -103,7 +103,7 @@ # in all cases... nsv_set ad_known_database_types . \ - [list [list "oracle" "Oracle8" "Oracle8"] [list "postgresql" "PostgreSQL" "PostgreSQL"]] + [list [list "oracle" "Oracle" "Oracle"] [list "postgresql" "PostgreSQL" "PostgreSQL"]] # # Initialize the list of available pools @@ -219,12 +219,18 @@ ns_log Error "$proc_name: RDBMS type could not be determined: $errmsg" } else { foreach known_database_type [nsv_get ad_known_database_types .] { - if { ![string compare $driver [lindex $known_database_type 1]] } { + + set this_type [lindex $known_database_type 1] + + # we do a string match here, because we want to + # match against Oracle, Oracle8, Oracle10, etc.. + if { [string match ${this_type}* $driver] } { set this_suffix [lindex $known_database_type 0] break } } } + ns_db releasehandle $db if { [string length $this_suffix] == 0 } { ns_log Notice "$proc_name: couldn't determine RDBMS type of database pool \"$pool\"."