Merge branch 'dql-functions' of git://github.com/stof/symfony-docs into stof-dql-functions

Author: weaverryan

book/doctrine/dbal.rst

@@ -132,6 +132,38 @@ which is the first one defined or the one configured via the
 Each connection is also accessible via the ``doctrine.dbal.[name]_connection``
 service where ``[name]`` if the name of the connection.
 
+Registering custom Mapping Types
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can register custom types through the configuration. They will be added to
+all configured connections.
+
+.. configuration-block::
+
+ .. code-block:: yaml
+
+ doctrine:
+ dbal:
+ types:
+ custom_first: Acme\HelloBundle\Type\CustomFirst
+ custom_second: Acme\HelloBundle\Type\CustomSecond
+
+ .. code-block:: xml
+
+ <container xmlns="http://symfony.com/schema/dic/services"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
+ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
+
+ <doctrine:config>
+ <doctrine:dbal>
+ <doctrine:type name="custom_first" class="Acme\HelloBundle\Type\CustomFirst" />
+ <doctrine:type name="custom_second" class="Acme\HelloBundle\Type\CustomSecond" />
+ </doctrine:dbal>
+ </doctrine:config>
+ </container>
+
 .. _PDO: http://www.php.net/pdo
 .. _documentation: http://www.doctrine-project.org/docs/dbal/2.0/en
 .. _Doctrine: http://www.doctrine-project.org

book/doctrine/orm.rst

@@ -460,6 +460,50 @@ that use this connection.
  </services>
  </container>
 
+Registering custom DQL functions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can register custom DQL functions throught the configuration.
+
+.. configuration-block::
+
+ .. code-block:: yaml
+
+ doctrine:
+ orm:
+ entity_managers:
+ default:
+ dql:
+ string_functions:
+ test_string: Acme\HelloBundle\DQL\StringFunction
+ second_string: Acme\HelloBundle\DQL\SecondStringFunction
+ numeric_functions:
+ test_numeric: Acme\HelloBundle\DQL\NumericFunction
+ datetime_functions:
+ test_datetime: Acme\HelloBundle\DQL\DatetimeFunction
+
+ .. code-block:: xml
+
+ <container xmlns="http://symfony.com/schema/dic/services"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
+ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
+
+ <doctrine:config>
+ <doctrine:orm>
+ <doctrine:entity-manager name="default">
+ <doctrine:dql>
+ <doctrine:string-function name="test_string>Acme\HelloBundle\DQL\StringFunction</doctrine:string-function>
+ <doctrine:string-function name="second_string>Acme\HelloBundle\DQL\SecondStringFunction</doctrine:string-function>
+ <doctrine:numeric-function name="test_numeric>Acme\HelloBundle\DQL\NumericFunction</doctrine:numeric-function>
+ <doctrine:datetime-function name="test_datetime>Acme\HelloBundle\DQL\DatetimeFunction</doctrine:datetime-function>
+ </doctrine:dql>
+ </doctrine:entity-manager>
+ </doctrine:orm>
+ </doctrine:config>
+ </container>
+
 .. index::
  single: Doctrine; ORM Console Commands
  single: CLI; Doctrine ORM

reference/bundle_configuration/DoctrineBundle.rst

@@ -38,9 +38,8 @@ Configuration Reference
  auto_generate_proxy_classes: true
  proxy_namespace: Proxies
  proxy_dir: %kernel.cache_dir%/doctrine/orm/Proxies
- default_entity_manager: default # Required
+ default_entity_manager: default # The first defined is used if not set
  entity_managers:
- # At least one has to be defined
  default:
  # The name of a DBAL connection (the one marked as default is used if not set)
  connection: conn1
@@ -56,6 +55,13 @@ Configuration Reference
  port: 11211
  instance_class: Memcache
  class: Doctrine\Common\Cache\MemcacheCache
+ dql:
+ string_functions:
+ test_string: Acme\HelloBundle\DQL\StringFunction
+ numeric_functions:
+ test_numeric: Acme\HelloBundle\DQL\NumericFunction
+ datetime_functions:
+ test_datetime: Acme\HelloBundle\DQL\DatetimeFunction
  em2:
  # ...
 
@@ -94,6 +100,11 @@ Configuration Reference
  <doctrine:entity-manager name="default" query-cache-driver="array" result-cache-driver="array" connection="conn1" class-metadata-factory-name="Doctrine\ORM\Mapping\ClassMetadataFactory">
  <doctrine:metadata-cache-driver type="memcache" host="localhost" port="11211" instance-class="Memcache" class="Doctrine\Common\Cache\MemcacheCache" />
  <doctrine:mapping name="AcmeHelloBundle" />
+ <doctrine:dql>
+ <doctrine:string-function name="test_string>Acme\HelloBundle\DQL\StringFunction</doctrine:string-function>
+ <doctrine:numeric-function name="test_numeric>Acme\HelloBundle\DQL\NumericFunction</doctrine:numeric-function>
+ <doctrine:datetime-function name="test_datetime>Acme\HelloBundle\DQL\DatetimeFunction</doctrine:datetime-function>
+ </doctrine:dql>
  </doctrine:entity-manager>
  <doctrine:entity-manager name="em2" connection="conn2" metadata-cache-driver="apc">
  <doctrine:mapping