Skip to content

Commit

Permalink
Merge pull request #622 from kenjis/fix_active_record.rst
Browse files Browse the repository at this point in the history
Fix user guide active_record.rst formatting and removed old PHP 5 note.
  • Loading branch information
Phil Sturgeon committed Oct 26, 2011
2 parents 3932ca1 + c35d2c9 commit 308692d
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions user_guide_src/source/database/active_record.rst
Expand Up @@ -96,7 +96,7 @@ function::

Please read the about the where function below for more information.

Note: get_where() was formerly known as getwhere(), which has been
.. note:: get_where() was formerly known as getwhere(), which has been
removed

$this->db->select()
Expand Down Expand Up @@ -198,7 +198,7 @@ Permits you to write the JOIN portion of your query::
$query = $this->db->get();
// Produces:
// SELECT * FROM blogs // JOIN comments ON comments.id = blogs.id
// SELECT * FROM blogs JOIN comments ON comments.id = blogs.id

Multiple function calls can be made if you need several joins in one
query.
Expand Down Expand Up @@ -836,7 +836,7 @@ $this->db->empty_table()
Generates a delete SQL string and runs the
query.::

$this->db->empty_table('mytable'); // Produces // DELETE FROM mytable
$this->db->empty_table('mytable'); // Produces: DELETE FROM mytable


$this->db->truncate()
Expand All @@ -847,7 +847,7 @@ Generates a truncate SQL string and runs the query.
::

$this->db->from('mytable');
$this->db->truncate();
$this->db->truncate();
// or
Expand Down Expand Up @@ -878,8 +878,6 @@ multiple functions. Consider this example::
->limit(10, 20)
->get('mytable');

.. note:: Method chaining only works with PHP 5.

.. _ar-caching:

*********************
Expand Down

0 comments on commit 308692d

Please sign in to comment.