Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #648744 by fago: added support for DBTNG auto completion in IDEs. Usability improvement.

merge-requests/26/head
Dries Buytaert 2009-12-02 23:05:13 +00:00
parent 912dcde784
commit a49c496710
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
includes/database/database.inc
View File

@ -2003,7 +2003,7 @@ class DatabaseStatementBase extends PDOStatement implements DatabaseStatementInt
* the order of placeholders in the query string. * the order of placeholders in the query string.
* @param $options * @param $options
* An array of options to control how the query operates. * An array of options to control how the query operates.
* @return * @return DatabaseStatementInterface
* A prepared statement object, already executed. * A prepared statement object, already executed.
*/ */
function db_query($query, array $args = array(), array $options = array()) { function db_query($query, array $args = array(), array $options = array()) {
@ -2033,7 +2033,7 @@ function db_query($query, array $args = array(), array $options = array()) {
* the order of placeholders in the query string. * the order of placeholders in the query string.
* @param $options * @param $options
* An array of options to control how the query operates. * An array of options to control how the query operates.
* @return * @return DatabaseStatementInterface
* A prepared statement object, already executed. * A prepared statement object, already executed.
*/ */
function db_query_range($query, $from, $count, array $args = array(), array $options = array()) { function db_query_range($query, $from, $count, array $args = array(), array $options = array()) {
@ -2077,7 +2077,7 @@ function db_query_temporary($query, array $args = array(), array $options = arra
* The table into which to insert. * The table into which to insert.
* @param $options * @param $options
* An array of options to control how the query operates. * An array of options to control how the query operates.
* @return * @return InsertQuery
* A new InsertQuery object for this connection. * A new InsertQuery object for this connection.
*/ */
function db_insert($table, array $options = array()) { function db_insert($table, array $options = array()) {
@ -2094,7 +2094,7 @@ function db_insert($table, array $options = array()) {
* The table into which to merge. * The table into which to merge.
* @param $options * @param $options
* An array of options to control how the query operates. * An array of options to control how the query operates.
* @return * @return MergeQuery
* A new MergeQuery object for this connection. * A new MergeQuery object for this connection.
*/ */
function db_merge($table, array $options = array()) { function db_merge($table, array $options = array()) {
@ -2111,7 +2111,7 @@ function db_merge($table, array $options = array()) {
* The table to update. * The table to update.
* @param $options * @param $options
* An array of options to control how the query operates. * An array of options to control how the query operates.
* @return * @return UpdateQuery
* A new UpdateQuery object for this connection. * A new UpdateQuery object for this connection.
*/ */
function db_update($table, array $options = array()) { function db_update($table, array $options = array()) {
@ -2128,7 +2128,7 @@ function db_update($table, array $options = array()) {
* The table from which to delete. * The table from which to delete.
* @param $options * @param $options
* An array of options to control how the query operates. * An array of options to control how the query operates.
* @return * @return DeleteQuery
* A new DeleteQuery object for this connection. * A new DeleteQuery object for this connection.
*/ */
function db_delete($table, array $options = array()) { function db_delete($table, array $options = array()) {
@ -2145,7 +2145,7 @@ function db_delete($table, array $options = array()) {
* The table from which to delete. * The table from which to delete.
* @param $options * @param $options
* An array of options to control how the query operates. * An array of options to control how the query operates.
* @return * @return TruncateQuery
* A new TruncateQuery object for this connection. * A new TruncateQuery object for this connection.
*/ */
function db_truncate($table, array $options = array()) { function db_truncate($table, array $options = array()) {
@ -2165,7 +2165,7 @@ function db_truncate($table, array $options = array()) {
* The alias for the base table of this query. * The alias for the base table of this query.
* @param $options * @param $options
* An array of options to control how the query operates. * An array of options to control how the query operates.
* @return * @return SelectQuery
* A new SelectQuery object for this connection. * A new SelectQuery object for this connection.
*/ */
function db_select($table, $alias = NULL, array $options = array()) { function db_select($table, $alias = NULL, array $options = array()) {
@ -2185,7 +2185,7 @@ function db_select($table, $alias = NULL, array $options = array()) {
* @param $options * @param $options
* An array of options to control how the transaction operates. Only the * An array of options to control how the transaction operates. Only the
* target key has any meaning in this case. * target key has any meaning in this case.
* @return * @return DatabaseTransaction
* A new DatabaseTransaction object for this connection. * A new DatabaseTransaction object for this connection.
*/ */
function db_transaction($required = FALSE, Array $options = array()) { function db_transaction($required = FALSE, Array $options = array()) {

7
includes/database/query.inc
View File

@ -1353,6 +1353,8 @@ class DatabaseCondition implements QueryConditionInterface, Countable {
/** /**
* Returns a new DatabaseCondition, set to "OR" all conditions together. * Returns a new DatabaseCondition, set to "OR" all conditions together.
*
* @return DatabaseCondition
*/ */
function db_or() { function db_or() {
return new DatabaseCondition('OR'); return new DatabaseCondition('OR');
@ -1360,6 +1362,8 @@ function db_or() {
/** /**
* Returns a new DatabaseCondition, set to "AND" all conditions together. * Returns a new DatabaseCondition, set to "AND" all conditions together.
*
* @return DatabaseCondition
*/ */
function db_and() { function db_and() {
return new DatabaseCondition('AND'); return new DatabaseCondition('AND');
@ -1367,6 +1371,8 @@ function db_and() {
/** /**
* Returns a new DatabaseCondition, set to "XOR" all conditions together. * Returns a new DatabaseCondition, set to "XOR" all conditions together.
*
* @return DatabaseCondition
*/ */
function db_xor() { function db_xor() {
return new DatabaseCondition('XOR'); return new DatabaseCondition('XOR');
@ -1377,6 +1383,7 @@ function db_xor() {
* *
* @param * @param
* The conjunction (AND, OR, XOR, etc.) to use on conditions. * The conjunction (AND, OR, XOR, etc.) to use on conditions.
* @return DatabaseCondition
*/ */
function db_condition($conjunction) { function db_condition($conjunction) {
return new DatabaseCondition($conjunction); return new DatabaseCondition($conjunction);