summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-07-15 23:25:15 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-13 19:18:39 +0200
commit5025929d76172efd6dd3a7b0f4da7611a3df9391 (patch)
tree0bdc47fdbdd520ac5f2cb6bb156f1d9c3974b9b7 /system/database
parent26b9ae2f500da7658074619af9c6dd982b77d0b8 (diff)
Fixed conflicted changelog.
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_active_rec.php15
1 files changed, 15 insertions, 0 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 7ddf20d07..bc11ff436 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -1599,6 +1599,21 @@ class CI_DB_active_record extends CI_DB_driver {
// --------------------------------------------------------------------
/**
+ * Set DB Prefix
+ *
+ * Set's the DB Prefix to something new without needing to reconnect
+ *
+ * @param string the prefix
+ * @return string
+ */
+ public function set_dbprefix($prefix = '')
+ {
+ return $this->dbprefix = $prefix;
+ }
+
+ // --------------------------------------------------------------------
+
+ /**
* Track Aliases
*
* Used to track SQL statements written with aliased tables.