Merge branch '3.1/develop' into 3.2/develop

Author: cbandy

classes/kohana/database/query.php

@@ -1,6 +1,6 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 /**
- * Database query wrapper.  See [Prepared Statements](database/query/prepared) for usage and examples.
+ * Database query wrapper.  See [Parameterized Statements](database/query/parameterized) for usage and examples.
  *
  * @package    Kohana/Database
  * @category   Query

guide/database/config.md

@@ -24,7 +24,7 @@ CONNECTION_ARRAY
 :  Specific driver options for connecting to your database. (Driver options are explained [below](#connection-settings).)
 
 TABLE_PREFIX
-:  Prefix that will be added to all table names by the [query builder](#query_building). Prepared statements will **not** use the table prefix.
+:  Prefix that will be added to all table names by the [query builder](#query_building).
 
 QUERY_PROFILING
 :  Enables [profiling](../kohana/profiling) of database queries.  This is useful for seeing how many queries each page is using, and which are taking the longest.  You must enable the profiler the view these stats.

guide/database/examples.md

@@ -2,9 +2,9 @@
 
 Here are some "real world" examples of using the database library to construct your queries and use the results.
 
-## Examples of Prepared Statements
+## Examples of Parameterized Statements
 
-TODO: 4-6 examples of prepared statements of varying complexity, including a good bind() example.
+TODO: 4-6 examples of parameterized statements of varying complexity, including a good bind() example.
 
 ## Pagination and search/filter
 

guide/database/menu.md

@@ -1,7 +1,7 @@
 ## [Database]()
 - [Configuration](config)
 - [Querying](query)
-   - [Prepared Statements](query/prepared)
+   - [Parameterized Statements](query/parameterized)
    - [Query Builder](query/builder)
 - [Results](results)
 - [Examples](examples)

guide/database/query.md

@@ -1,5 +1,5 @@
 # Making Queries
 
-There are two different ways to make queries. The simplest way to make a query is to use [Database_Query], via [DB::query], to manually create queries. These queries are called [prepared statements](query/prepared) and allow you to set query parameters which are automatically escaped. The second way to make a query is by building the query using method calls. This is done using the [query builder](query/builder).
+There are two different ways to make queries. The simplest way to make a query is to use [Database_Query], via [DB::query], to manually create queries. These queries are called [parameterized statements](query/parameterized) and allow you to set query parameters which are automatically escaped. The second way to make a query is by building the query using method calls. This is done using the [query builder](query/builder).
 
 [!!] All queries are run using the `execute` method, which accepts a [Database] object or instance name. See [Database_Query::execute] for more information.

guide/database/query/builder.md

@@ -2,8 +2,6 @@
 
 Creating queries dynamically using objects and methods allows queries to be written very quickly in an agnostic way. Query building also adds identifier (table and column name) quoting, as well as value quoting.
 
-[!!] At this time, it is not possible to combine query building with prepared statements.
-
 ## Select
 
 Each type of database query is represented by a different class, each with their own methods. For instance, to create a SELECT query, we use [DB::select] which is a shortcut to return a new [Database_Query_Builder_Select] object:

guide/database/query/prepared.md renamed to guide/database/query/parameterized.md

@@ -1,6 +1,6 @@
-# Prepared Statements
+# Parameterized Statements
 
-Using prepared statements allows you to write SQL queries manually while still escaping the query values automatically to prevent [SQL injection](http://wikipedia.org/wiki/SQL_Injection). Creating a query is simple:
+Using parameterized statements allows you to write SQL queries manually while still escaping the query values automatically to prevent [SQL injection](http://wikipedia.org/wiki/SQL_Injection). Creating a query is simple:
 
     $query = DB::query(Database::SELECT, 'SELECT * FROM users WHERE username = :user');
 

guide/database/results.md

@@ -2,7 +2,7 @@
 
 ## Execute
 
-Once you have a query object built, either through a prepared statement or through the builder, you must then `execute()` the query and retrieve the results. Depending on the query type used, the results returned will vary. 
+Once you have a query object built, either through a parameterized statement or through the builder, you must then `execute()` the query and retrieve the results. Depending on the query type used, the results returned will vary. 
 
 ## Select