summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-12-14 17:01:04 +0100
committerAndrey Andreev <narf@devilix.net>2014-12-14 17:01:04 +0100
commitfb81cd85175a2d5020a21315cf7c58d099126dc0 (patch)
tree348a938ea239dbdc04df4a6b5fc4a3244f7ef964 /user_guide_src/source/database
parentc9963f45f648af713e1a46d3fb5bcf018a0758eb (diff)
parent71b93b34a678e607e1935f5185836664056a3ccc (diff)
Merge pull request #3410 from druu/feature/userguide_redesign
Feature/userguide redesign
Diffstat (limited to 'user_guide_src/source/database')
-rw-r--r--user_guide_src/source/database/query_builder.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 030599e31..b06396e96 100644
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -2,8 +2,8 @@
Query Builder Class
###################
-CodeIgniter gives you access to a Query Builder class. This pattern
-allows information to be retrieved, inserted, and updated in your
+CodeIgniter gives you access to a Query Builder class. This pattern
+allows information to be retrieved, inserted, and updated in your
database with minimal scripting. In some cases only one or two lines
of code are necessary to perform a database action.
CodeIgniter does not require that each database table be its own class
@@ -110,10 +110,10 @@ Permits you to write the SELECT portion of your query::
.. note:: If you are selecting all (\*) from a table you do not need to
use this function. When omitted, CodeIgniter assumes that you wish
- to select all fields and automatically adds 'SELECT *'.
+ to select all fields and automatically adds 'SELECT \*'.
``$this->db->select()`` accepts an optional second parameter. If you set it
-to FALSE, CodeIgniter will not try to protect your field or table names.
+to FALSE, CodeIgniter will not try to protect your field or table names.
This is useful if you need a compound select statement where automatic
escaping of fields may break them.
@@ -1097,7 +1097,7 @@ Class Reference
:returns: Number of rows in the query result
:rtype: int
- Generates a platform-specific query string that counts
+ Generates a platform-specific query string that counts
all records returned by an Query Builder query.
.. method:: get([$table = ''[, $limit = NULL[, $offset = NULL]]])
@@ -1540,4 +1540,4 @@ Class Reference
:returns: The compiled SQL statement as a string
:rtype: string
- Compiles a DELETE statement and returns it as a string. \ No newline at end of file
+ Compiles a DELETE statement and returns it as a string.