diff options
| -rw-r--r-- | system/database/DB_active_rec.php | 74 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 | ||||
| -rw-r--r-- | user_guide/database/active_record.html | 10 |
3 files changed, 7 insertions, 78 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 3e9923e6f..953cc9548 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -399,18 +399,6 @@ class CI_DB_active_record extends CI_DB_driver { // -------------------------------------------------------------------- /** - * orwhere() is an alias of or_where() - * this function is here for backwards compatibility, as - * orwhere() has been deprecated - */ - function orwhere($key, $value = NULL, $escape = TRUE) - { - return $this->or_where($key, $value, $escape); - } - - // -------------------------------------------------------------------- - - /** * Where * * Called by where() or orwhere() @@ -672,18 +660,6 @@ class CI_DB_active_record extends CI_DB_driver { // -------------------------------------------------------------------- /** - * orlike() is an alias of or_like() - * this function is here for backwards compatibility, as - * orlike() has been deprecated - */ - function orlike($field, $match = '', $side = 'both') - { - return $this->or_like($field, $match, $side); - } - - // -------------------------------------------------------------------- - - /** * Like * * Called by like() or orlike() @@ -776,18 +752,6 @@ class CI_DB_active_record extends CI_DB_driver { // -------------------------------------------------------------------- /** - * groupby() is an alias of group_by() - * this function is here for backwards compatibility, as - * groupby() has been deprecated - */ - function groupby($by) - { - return $this->group_by($by); - } - - // -------------------------------------------------------------------- - - /** * Sets the HAVING value * * Separates multiple calls with AND @@ -801,19 +765,7 @@ class CI_DB_active_record extends CI_DB_driver { { return $this->_having($key, $value, 'AND ', $escape); } - - // -------------------------------------------------------------------- - - /** - * orhaving() is an alias of or_having() - * this function is here for backwards compatibility, as - * orhaving() has been deprecated - */ - - function orhaving($key, $value = '', $escape = TRUE) - { - return $this->or_having($key, $value, $escape); - } + // -------------------------------------------------------------------- /** @@ -939,18 +891,6 @@ class CI_DB_active_record extends CI_DB_driver { // -------------------------------------------------------------------- /** - * orderby() is an alias of order_by() - * this function is here for backwards compatibility, as - * orderby() has been deprecated - */ - function orderby($orderby, $direction = '') - { - return $this->order_by($orderby, $direction); - } - - // -------------------------------------------------------------------- - - /** * Sets the LIMIT value * * @access public @@ -1126,18 +1066,6 @@ class CI_DB_active_record extends CI_DB_driver { // -------------------------------------------------------------------- /** - * getwhere() is an alias of get_where() - * this function is here for backwards compatibility, as - * getwhere() has been deprecated - */ - function getwhere($table = '', $where = null, $limit = null, $offset = null) - { - return $this->get_where($table, $where, $limit, $offset); - } - - // -------------------------------------------------------------------- - - /** * Insert_Batch * * Compiles batch insert strings and runs the queries diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f32ee58b3..7e86ba4eb 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -109,6 +109,7 @@ Hg Tag: </p> <li>Semantic change to db->version() function to allow a list of exceptions for databases with functions to return version string instead of specially formed SQL queries. Currently this list only includes Oracle and SQLite.</li> <li>Fixed a bug where driver specific table identifier protection could lead to malformed queries in the <kbd>field_data()</kbd> functions.</li> <li>Fixed a bug where an undefined class variable was referenced in database drivers.</li> + <li>Removed the following deprecated functions: orwhere, orlike, groupby, orhaving, orderby, getwhere.</li> </ul> </li> <li>Helpers diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 2c12d628e..482115ccd 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -116,7 +116,7 @@ instead of using the db->where() function:</p> <code>$query = $this->db->get_where('mytable', array('id' => $id), $limit, $offset);</code> <p>Please read the about the where function below for more information.</p> -<p class="important">Note: get_where() was formerly known as getwhere(), which has been deprecated</p> +<p class="important">Note: get_where() was formerly known as getwhere(), which has been removed</p> <h2>$this->db->select();</h2> <p>Permits you to write the SELECT portion of your query:</p> @@ -274,7 +274,7 @@ $this->db->or_where('id >', $id); <br /> <br />// Produces: WHERE name != 'Joe' OR id > 50</code> -<p class="important">Note: or_where() was formerly known as orwhere(), which has been deprecated.</p> +<p class="important">Note: or_where() was formerly known as orwhere(), which has been removed.</p> <h2>$this->db->where_in();</h2> @@ -356,7 +356,7 @@ $this->db->or_like('body', $match); -<p class="important">Note: or_like() was formerly known as orlike(), which has been deprecated.</p> +<p class="important">Note: or_like() was formerly known as orlike(), which has been removed.</p> <h2>$this->db->not_like();</h2> <p>This function is identical to <strong>like()</strong>, except that it generates NOT LIKE statements:</p> <code> $this->db->not_like('title', 'match');<br /> @@ -381,7 +381,7 @@ $this->db->or_not_like('body', 'match'); <br /> <br /> <br />// Produces: GROUP BY title, date</code> -<p class="important">Note: group_by() was formerly known as groupby(), which has been deprecated. </p> +<p class="important">Note: group_by() was formerly known as groupby(), which has been removed. </p> <h2> $this->db->distinct();<br /> </h2> @@ -439,7 +439,7 @@ The second parameter lets you set the direction of the result. Options are <kbd <br /> // Produces: ORDER BY title DESC, name ASC </code></p> -<p class="important">Note: order_by() was formerly known as orderby(), which has been deprecated.</p> +<p class="important">Note: order_by() was formerly known as orderby(), which has been removed.</p> <p class="important">Note: random ordering is not currently supported in Oracle or MSSQL drivers. These will default to 'ASC'.</p> <h2>$this->db->limit();</h2> <p>Lets you limit the number of rows you would like returned by the query:</p> |