RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 15:16:04 +03:00
Code Issues Projects Releases Wiki Activity
7,621 Commits 5 Branches 0 Tags 32 MiB
ce594fb152
Commit Graph

537 Commits

Author SHA1 Message Date
Benjamin Eberlei
ce594fb152 [DDC-2256] Cleanup patch, move dependency on EntityManager out of ResultSetMapping and let AbstractQuery perform the translation. 2013-02-13 09:05:35 +01:00
Alexander
9bf501dd25 Revert "allowed to pass filter objects to the configurator" 
This reverts commit a9b4debe37. See the
discussion on the original PR:

https://github.com/doctrine/doctrine2/pull/434

Conflicts:
	lib/Doctrine/ORM/Configuration.php
 2013-02-09 20:28:52 +01:00
Szczepan Cieślik
92ada246b5 [DDC-2256] Code improvements. 2013-01-26 09:09:21 +01:00
Szczepan Cieślik
935594578a [DDC-2256] Code refactorization. 2013-01-25 13:15:14 +01:00
Szczepan Cieślik
d7f82221d1 [DDC-2256] Moved aliases translation to ResultSetMapping, fixed tests. 2013-01-25 12:06:13 +01:00
Fabio B. Silva
93fba518a6 keep braces 2013-01-19 13:38:44 -02:00
Fabio B. Silva
4dcd5a1286 Fix DDC-2234 2013-01-18 23:18:50 -02:00
Guilherme Blanco
71efe2109a Merge pull request #548 from nemekzg/DDC-2203 
Fix for DDC-2203
 2013-01-10 11:13:18 -08:00
nemekzg
cfd1b07ffe Fix for DDC-2203 2013-01-10 16:52:19 +01:00
Benjamin Eberlei
904effcf4e Merge pull request #538 from FabioBatSilva/identity-composite-key 
IDENTITY() Support composite primary key
 2012-12-24 01:19:05 -08:00
Benjamin Eberlei
e319e34783 Merge pull request #528 from BenMorel/master 
Documentation fixes
 2012-12-23 12:22:09 -08:00
Fabio B. Silva
3d99711ac8 fix PHPDoc 2012-12-22 10:36:23 -02:00
Fabio B. Silva
99ab58febd Fix CS 2012-12-22 10:36:23 -02:00
Fabio B. Silva
2e90cd9924 Identity function support composite primary key 2012-12-22 10:36:23 -02:00
Fabio B. Silva
eda43c77bb Fix DDC-2208 2012-12-21 10:00:40 -02:00
Fabio B. Silva
2104ae9935 fix DDC-2205 2012-12-20 23:06:30 -02:00
Benjamin Morel
ba16789843 Fixed documentation for Doctrine\ORM\Query 2012-12-13 16:36:14 +00:00
Benjamin Morel
28966e2087 Fixed documentation for Doctrine\ORM\Query\Expr and Doctrine\ORM\Query\Filter 2012-12-13 12:05:34 +00:00
Benjamin Morel
d4357801a2 Fixed documentation for Doctrine\ORM\Query\Exec 2012-12-13 11:57:46 +00:00
Benjamin Morel
98ac6b5fec Fixed documentation for Doctrine\ORM\Query\AST 2012-12-13 11:52:19 +00:00
Benjamin Morel
f743da0e02 Fixed documentation for Doctrine\ORM\Query\AST\Functions 2012-12-13 10:42:25 +00:00
Benjamin Morel
26d6f5ce4e Fixed coding standard issue, as per @stof's request. 2012-11-30 19:10:53 +00:00
Benjamin Morel
5edc287848 Fixed documentation for Doctrine\ORM\Query\AST\Node::dispatch(). 2012-11-30 11:41:03 +00:00
Guilherme Blanco
f4c0fd1744 Added support to subselects in update item. 2012-11-27 14:36:56 -05:00
Benjamin Eberlei
8457a9e77e Merge pull request #518 from Fran6co/fix-double-on 
regression fix for left joins (double ON)
 2012-11-25 03:27:17 -08:00
Francisco Facioni
c84099508f added outer left join 2012-11-22 09:59:44 -03:00
Francisco Facioni
9c59ed5891 regression fix for left joins (double ON) 2012-11-20 12:30:52 -03:00
Lukasz Cybula
08a3423ce2 CS fixes 2012-11-20 12:42:05 +01:00
Lukasz Cybula
2c99ecf586 Extended TreeWalker interface with getQueryComponenets() and setQueryComponent() which are used by the Parser class 2012-11-20 12:42:05 +01:00
Benjamin Eberlei
17bb564534 [DDC-2055] Some adjustments to ResultSetMappingBuildder patch 2012-11-19 16:54:56 +01:00
Guilherme Blanco
7a895209e3 Merge pull request #502 from gwis/master 
Fix for invalid 'double-ON' SQL generation with entity inheritance type JOINED.
 2012-11-05 16:15:45 -08:00
Benjamin Morel
88b29a4e59 Fixed errors: 
- Typo in variable name in JoinClassPathExpression;
 - Undefined class AST\ArithmeticPrimary (x2);
 - QueryException::invalidPathExpression() expects a PathExpression, not a string.
 2012-11-05 14:45:57 -08:00
Gordon Stratton
9e916a2893 Fix for invalid 'double-ON' SQL generation with entity inheritance type JOINED. 
In SqlWalker::walkJoin(), SqlWalker::walkRangeVariableDeclaration() can be
called which may produce an 'ON' clause if the entity inheritance type is
JOINED. As walkJoin() may then produce another ON clause, this results in
invalid SQL (e.g. '... ON foo = bar ON (baz = quux) ...' when the inheritance
type is JOINED.

This adds a test and a fix for the problem, by checking for an inheritance type
of JOINED in walkJoin() and using AND instead of ON in the appropriate place.

It seems like this part of the code is begging to be refactored. This is my
first foray into Doctrine internals and can't see a way to do this without
stomping all over the rest of the code, but this section seems ripe for cleanup
by somebody who is familiar.
 2012-11-05 01:19:25 -08:00
Guilherme Blanco
7d7287a1ba Merge pull request #434 from bamarni/filter-objects 
allowed to pass filter objects to the configurator
 2012-11-02 17:52:23 -07:00
Guilherme Blanco
ec1950d3ca Merge pull request #448 from stefanklug/master-parserFix 
Fixed Parser problem for SELECT (((3))) as ....
 2012-11-02 17:46:43 -07:00
Vaughn Clayton
ae30ce4596 [DDC-2113] Surround WHERE clause with parens if using SQLFilter 2012-11-02 08:48:57 -04:00
Martin Hasoň
7f33143502 Added NOT LIKE expression 2012-10-25 12:58:19 +02:00
Guilherme Blanco
38d8c7f0d9 Merge pull request #467 from docteurklein/fix-bool-type-binding 
add bool detection when inferring type
 2012-10-21 18:39:29 -07:00
jakoch
d4a6c488ca fixed use statements 2012-10-12 13:53:20 +02:00
Klein Florian
7f8af83b5b add bool detection when inferring type 2012-10-10 11:20:41 +02:00
Stefan Klug
bf54c22cd9 removed unneded variable 2012-10-08 14:01:04 +02:00
Stefan Klug
1e1f34f9cb cleanup ScalarExpression 
_isFunction doesn't exclude subselects anymore
 2012-10-08 13:59:54 +02:00
Stefan Klug
6ccf7a7ac7 fixed Parser which incorrectly treated ((( as function 2012-10-08 13:57:34 +02:00
yohang
adc3d21385 Fixed typo on ConcatFunction 2012-10-08 12:44:36 +02:00
Benjamin Eberlei
235ad8e553 [DDC-2052] Add SqlWalker::setQueryComponent() to allow modification of the query component in a custom output walker 2012-10-06 11:16:16 +02:00
Benjamin Eberlei
a0440b63bb Merge pull request #462 from doctrine/DDC-2055 
[DDC-2055] Generate SELECT clause from ResultSetMappingBuilder
 2012-10-05 09:46:37 -07:00
Benjamin Eberlei
a47359e3f5 [DDC-2055] Fix CS 2012-10-04 20:18:10 +02:00
Benjamin Eberlei
913377e31b [DDC-2055] Add support to generate entity result parts of the SELECT clause from a ResultSetMappingBuilder instance. Add support for column incrementing. 2012-10-03 12:35:14 +02:00
Fabio B. Silva
dd984c7319 remove extra line 2012-09-29 16:19:03 -03:00
Fabio B. Silva
5f89fa4190 fix CS 2012-09-29 16:19:03 -03:00