diff options
| author | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-31 15:44:02 +0100 |
|---|---|---|
| committer | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-31 15:44:02 +0100 |
| commit | 3ccc386be4e0e1e4b3d47f1785e11d4b8613ef72 (patch) | |
| tree | f1c8cd29775537b8da76143edeec5b6c8d659550 /system/database/drivers/postgre | |
| parent | a9a1d2520493211ca35f7ab56866d0e154afc1c3 (diff) | |
| parent | f2b19fee7876708c7a7bb5cba6b7df682a9d2a53 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/drivers/postgre')
| -rw-r--r-- | system/database/drivers/postgre/postgre_driver.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 1b9474920..ca231f6f7 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -47,6 +47,13 @@ class CI_DB_postgre_driver extends CI_DB { protected $_random_keyword = ' RANDOM()'; // database specific random keyword /** + * Database schema + * + * @var string + */ + public $schema = 'public'; + + /** * Constructor * * Creates a DSN string to be used for db_connect() and db_pconnect() @@ -393,12 +400,12 @@ class CI_DB_postgre_driver extends CI_DB { * * Generates a platform-specific query string so that the table names can be fetched * - * @param bool + * @param bool $prefix_limit = FALSE * @return string */ protected function _list_tables($prefix_limit = FALSE) { - $sql = 'SELECT "table_name" FROM "information_schema"."tables" WHERE "table_schema" = \'public\''; + $sql = 'SELECT "table_name" FROM "information_schema"."tables" WHERE "table_schema" = \''.$this->schema."'"; if ($prefix_limit !== FALSE && $this->dbprefix !== '') { |