| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -162,8 +162,15 @@ |
| 163 | 163 | $wgDBtype = "mysql"; |
| 164 | 164 | /** Table name prefix */ |
| 165 | 165 | $wgDBprefix = ''; |
| | 166 | +/** Database schema |
| | 167 | + * on some databases this allows separate |
| | 168 | + * logical namespace for application data |
| | 169 | + */ |
| | 170 | +$wgDBschema = 'mediawiki'; |
| 166 | 171 | /**#@-*/ |
| 167 | 172 | |
| | 173 | + |
| | 174 | + |
| 168 | 175 | # Shared database for multiple wikis. |
| 169 | 176 | # Presently used for storing a user table for single sign-on |
| 170 | 177 | # The server for this database must be the same as for the main |
| Index: trunk/phase3/includes/DatabasePostgreSQL.php |
| — | — | @@ -53,6 +53,8 @@ |
| 54 | 54 | die( "PostgreSQL functions missing, have you compiled PHP with the --with-pgsql option?\n" ); |
| 55 | 55 | } |
| 56 | 56 | |
| | 57 | + global $wgDBschema; |
| | 58 | + |
| 57 | 59 | $this->close(); |
| 58 | 60 | $this->mServer = $server; |
| 59 | 61 | $this->mUser = $user; |
| — | — | @@ -75,6 +77,7 @@ |
| 76 | 78 | } else { |
| 77 | 79 | $this->mOpened = true; |
| 78 | 80 | } |
| | 81 | + $this->query("SET search_path = $wgDBschema,public"); |
| 79 | 82 | } |
| 80 | 83 | return $this->mConn; |
| 81 | 84 | } |