summaryrefslogtreecommitdiff
path: root/classes/database
diff options
context:
space:
mode:
authorLeonardo Sapiras2011-10-17 10:00:59 +0000
committerJehan-Guillaume (ioguix) de Rorthais2012-08-22 10:23:50 +0000
commita524be779bcb7881dada321e4f1e8c1088ba1cc2 (patch)
tree9585f66b5d80441ba656e4877482cdd3f2019e14 /classes/database
parentd5ee93d9318e5c4b253a08ea0ccbbd6224218ec5 (diff)
Remove old plugin architecture.
Patch by Leonardo Sapiras, remerged by ioguix. * remove old plugin architecture * remove plugin Slony
Diffstat (limited to 'classes/database')
-rwxr-xr-xclasses/database/Postgres.php7
-rw-r--r--classes/database/Postgres80.php8
2 files changed, 2 insertions, 13 deletions
diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 69073d80..0421989f 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -834,15 +834,10 @@ class Postgres extends ADODB_base {
* @return All schemas, sorted alphabetically
*/
function getSchemas() {
- global $conf, $slony;
+ global $conf;
if (!$conf['show_system']) {
$where = "WHERE nspname NOT LIKE 'pg@_%' ESCAPE '@' AND nspname != 'information_schema'";
- if (isset($slony) && $slony->isEnabled()) {
- $temp = $slony->slony_schema;
- $this->clean($temp);
- $where .= " AND nspname != '{$temp}'";
- }
}
else $where = "WHERE nspname !~ '^pg_t(emp_[0-9]+|oast)$'";
diff --git a/classes/database/Postgres80.php b/classes/database/Postgres80.php
index ce15f976..1f29c1cf 100644
--- a/classes/database/Postgres80.php
+++ b/classes/database/Postgres80.php
@@ -110,16 +110,10 @@ class Postgres80 extends Postgres81 {
* @return All schemas, sorted alphabetically
*/
function getSchemas() {
- global $conf, $slony;
+ global $conf;
if (!$conf['show_system']) {
$where = "WHERE nspname NOT LIKE 'pg@_%' ESCAPE '@' AND nspname != 'information_schema'";
- if (isset($slony) && $slony->isEnabled()) {
- $temp = $slony->slony_schema;
- $this->clean($temp);
- $where .= " AND nspname != '{$temp}'";
- }
-
}
else $where = "WHERE nspname !~ '^pg_t(emp_[0-9]+|oast)$'";
$sql = "