RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-03 05:49:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5918 from tonynelson19/master

Browse Source 
Make setSQL and setDQL function calls case-sensitive.
This commit is contained in:
Marco Pivetta 2016-07-05 19:50:59 +02:00 committed by GitHub
commit 5761d07c46
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/en/reference/dql-doctrine-query-language.rst
View File

@ -909,7 +909,7 @@ An instance of the ``Doctrine\ORM\Query`` class represents a DQL
query. You create a Query instance be calling query. You create a Query instance be calling
``EntityManager#createQuery($dql)``, passing the DQL query string. ``EntityManager#createQuery($dql)``, passing the DQL query string.
Alternatively you can create an empty ``Query`` instance and invoke Alternatively you can create an empty ``Query`` instance and invoke
``Query#setDql($dql)`` afterwards. Here are some examples: ``Query#setDQL($dql)`` afterwards. Here are some examples:
.. code-block:: php .. code-block:: php
@ -919,9 +919,9 @@ Alternatively you can create an empty ``Query`` instance and invoke
// example1: passing a DQL string // example1: passing a DQL string
$q = $em->createQuery('select u from MyProject\Model\User u'); $q = $em->createQuery('select u from MyProject\Model\User u');
// example2: using setDql // example2: using setDQL
$q = $em->createQuery(); $q = $em->createQuery();
$q->setDql('select u from MyProject\Model\User u'); $q->setDQL('select u from MyProject\Model\User u');
Query Result Formats Query Result Formats
~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~

4
lib/Doctrine/ORM/EntityManager.php
View File

@ -290,7 +290,7 @@ use Doctrine\Common\Util\ClassUtils;
$query = new Query($this); $query = new Query($this);
if ( ! empty($dql)) { if ( ! empty($dql)) {
$query->setDql($dql); $query->setDQL($dql);
} }
return $query; return $query;
@ -311,7 +311,7 @@ use Doctrine\Common\Util\ClassUtils;
{ {
$query = new NativeQuery($this); $query = new NativeQuery($this);
$query->setSql($sql); $query->setSQL($sql);
$query->setResultSetMapping($rsm); $query->setResultSetMapping($rsm);
return $query; return $query;