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.9.2.4 -r1.9.2.5
--- openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl 4 Feb 2017 14:08:13 -0000 1.9.2.4
+++ openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl 21 May 2017 09:19:36 -0000 1.9.2.5
@@ -232,14 +232,19 @@
ns_db releasehandle $db
if { $this_suffix eq "" } {
ns_log Notice "$proc_name: couldn't determine RDBMS type of database pool \"$pool\"."
- lappend bad_pools "
OpenACS could not determine the RDBMS type associated with
- pool \"$pool\"."
+ lappend bad_pools "OpenACS could not determine the RDBMS type associated with pool \"$pool\"."
set long_error 1
} elseif { [nsv_get ad_database_type .] eq "" } {
nsv_set ad_database_type . $this_suffix
+ #
+ # For the time being, keep the info in the nsv for
+ # backwards compatibility and and a version in a
+ # per-thead (namespaced) variable
+ #
+ set ::acs::database_type $this_suffix
+
} elseif { ![string match $this_suffix [nsv_get ad_database_type .]] } {
- ns_log Notice "$proc_name: Database pool \"$pool\" type \"$this_suffix\" differs from
- \"[nsv_get ad_database_type .]\"."
+ ns_log Notice "$proc_name: Database pool \"$pool\" type \"$this_suffix\" differs from \"[nsv_get ad_database_type .]\"."
lappend bad_pools "Database pool \"$pool\" is of type \"$this_suffix\". The
first database pool available to OpenACS was of type \"[nsv_get ad_database_type .]\". All database
pools must be configured to use the same RDMBS engine, user and database."