RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-05 16:53:21 +03:00
Code Issues Projects Releases Wiki Activity
5,453 Commits 5 Branches 0 Tags 32 MiB
2653d735e2
Commit Graph

3435 Commits

Author SHA1 Message Date
Alexander
2653d735e2 [DDC-551] Added state of the complete filter collection to the EM 
Previously it was sufficient to use the old parser result for a Query if
the DQL didn't change (Query::STATE_CLEAN), but now there must also be
no changes to the filter collection of the EntityManager.

In the old situation each Query object would create a hash of all the
filter objects on it's own. That was not very efficient.

This commit adds the state of the current filter collection to the
EntityManager. The state will be set to FILTERS_STATE_DIRTY as a filter
is enabled, removed or a parameter is set on a filter. The hash is also
computed by the EntityManager, but only if the filter collection is
dirty. This will prevent recalculation of the hash with each query.
 2011-08-16 13:34:42 +02:00
Alexander
3b1ddb0346 [DDC-551] Added filters to SQLWalker 2011-08-16 12:21:43 +02:00
Alexander
6cf7bdc2b7 Merge branch 'master' into DDC-551 2011-07-26 17:26:00 +02:00
Alexander
65f7e897b5 [DDC-1294] Add discriminator information to subselects 2011-07-26 00:19:26 +02:00
Alexander
e3dcfa8702 [DDC-551] Added filters to query hash + tests for hash 2011-07-22 17:01:18 +02:00
Guilherme Blanco
4b85d7a683 Reverted PR #86, which broke our suite. 2011-07-22 11:38:20 -03:00
Alexander
6163d9d932 [DDC-551] Added enabled filters to Query hash 2011-07-22 15:26:03 +02:00
Alexander
4266ab77b2 [DDC-551] Added __toString() method to SQLFilter 2011-07-22 14:55:00 +02:00
Alexander
4cf63a4e83 [DDC-551] Fixed the escaping of filter parameters 2011-07-22 14:51:30 +02:00
Alexander
d1908f7207 [DDC-551] Keep filter parameters and enabled filters sorted for hashing 2011-07-22 14:36:14 +02:00
Alexander
277fc751b6 [DDC-551] Added tests for SQLFilter 2011-07-22 13:51:26 +02:00
Alexander
b867744f15 [DDC-551] Added tests for SQLFilter functionality + small fixes 2011-07-22 13:08:49 +02:00
Alexander
a85902b08d [DDC-551] Initial code for filter functionality 2011-07-22 12:01:33 +02:00
Guilherme Blanco
4be7c3dac0 Merge pull request #85 from FabienPennequin/fix_ClassMetadataFactory 
Fixed php notice in ClassMetadataFactory
 2011-07-21 10:02:15 -07:00
kwiateusz
570799b48d Restoring the missing comment 2011-07-21 04:13:15 -07:00
kwiateusz
0e6121e8f5 Now findByOne really retrieve only one entity adding limit to query 2011-07-21 12:40:43 +02:00
Fabien Pennequin
99bdf65c10 Fixed php notice in ClassMetadataFactory 2011-07-17 19:39:55 +02:00
Benjamin Eberlei
d9b1dbbb09 DDC-1244 - Fix bug with entities without namespace 2011-07-12 23:43:24 +02:00
Benjamin Eberlei
c87dedbec5 DDC-1254 - Dont throw exception about missing id in disconnected metadata factory 2011-07-12 23:39:56 +02:00
Benjamin Eberlei
4796452b07 DDC-1268 - Singular add*() method name through using targetEntity shortname 2011-07-12 23:25:15 +02:00
Benjamin Eberlei
98fabd98be DDC-1240 - Fix optimistic lock exception loosing the message 2011-07-12 22:50:21 +02:00
Benjamin Eberlei
5733574867 Merge branch 'master' of github.com:doctrine/doctrine2 2011-07-12 22:47:33 +02:00
Benjamin Eberlei
c261315ea7 DDC-1250 - Fix bug with inverse one to one loading and ambigious column names in certain scenarios 2011-07-09 22:11:49 +02:00
Benjamin Eberlei
442a2b3a51 DDC-1257 - Fix bug where validation callbacks are added multiple times in EntityGenerator 2011-07-09 15:11:16 +02:00
Benjamin Eberlei
a8048af65d DDC-1251 - Fix bug in token parsing of EntityGenerator 2011-07-09 14:53:25 +02:00
Benjamin Eberlei
d7da292f60 Merge remote branch 'origin/master' 2011-07-09 14:43:04 +02:00
Benjamin Eberlei
2b207106a3 DDC-1022 - Call __wakeup() with the same semantics then ClassMetadata::newInstance() does inside UnitOfWork 2011-07-09 12:12:44 +02:00
Guilherme Blanco
9d1a647753 Merge branch 'master' of github.com:doctrine/doctrine2 2011-07-08 16:27:20 -03:00
Guilherme Blanco
b6bd46dbed General fix for end point as file extension on Annotation driver. 2011-07-08 16:26:54 -03:00
Benjamin Eberlei
ac76dafe62 Add doccomments, refactor into listener and dump method to allow re-use 2011-07-08 14:32:12 +02:00
Benjamin Eberlei
ef663c83f3 DDC-1258 - Add Debug UnitOfWork Listener 2011-07-08 14:27:59 +02:00
Benjamin Eberlei
024b7b7cb6 Bump Dev Version to 2.2.0-DEV 2011-07-04 21:34:59 +00:00
Benjamin Eberlei
dfdb735306 Release 2.1.0 2011-07-04 21:34:47 +00:00
Benjamin Eberlei
cb49648eed Bump Common and DBAL to 2.1 2011-07-04 21:33:36 +00:00
Benjamin Eberlei
2858b8290f DDC-1238 - Fixed a bug introduced when refactoring persisters hydration. This occurs when you call $em->clear() and you start accessing a proxy. 2011-07-04 23:19:08 +02:00
Guilherme Blanco
438dd9141f Merge branch 'master' of github.com:doctrine/doctrine2 2011-07-04 11:38:45 -03:00
Guilherme Blanco
db37d974c8 Increasing visibility of AnnotationReader inside AnnotationDriver from private to protected. 2011-07-04 11:33:44 -03:00
Benjamin Eberlei
6b54cceed7 Moved AnnotationRegistry::registerFile() call to Configuration#newDefaultAnnotationDriver() and documented the migration in UPGRADE_TO_2_1 2011-07-03 12:21:04 +02:00
Guilherme Blanco
550fcbc17f [DDC-1237] Fixed issue with QueryBuilder where user may have includes nested complex expression in a string format while consuming a composite expression (AND or OR). 2011-07-03 01:48:18 -03:00
Benjamin Eberlei
ffca455788 Bump Dev Version to 2.1.0RC4-DEV 2011-07-02 20:29:02 +00:00
Benjamin Eberlei
e4f2a56277 Release 2.1.0RC3 2011-07-02 20:28:37 +00:00
Benjamin Eberlei
cbe14a694a Update Common dependency to 2.1 RC3 2011-07-02 20:28:04 +00:00
Benjamin Eberlei
f589cd0d9f Update common version 2011-07-02 20:30:35 +02:00
Benjamin Eberlei
43d8466fa9 Update annotation handling in AnnotationDriver to work with AnnotationRegistry and bump common dependency 2011-07-02 19:48:43 +02:00
Benjamin Eberlei
5299bd788f DDC-1239 - Fix missing AND in Eager LEFT JOIN of entity persister when multiple join columns are used 2011-06-30 21:04:46 +02:00
Benjamin Eberlei
a0a81db045 DDC-1204, DDC-1203 - No need to throw this exception for abstract classes anymore 2011-06-30 20:57:29 +02:00
Benjamin Eberlei
5362206297 Revert "Fixed ClassMetadataFactory which was throwing an exception if parent class on inheritance hierarchy is an abstract class and also extends from a mapped superclass (so it contains an inheritance already), but is not in the discriminatorMap." 
This reverts commit 4603e94fe9.

Making an exception go away is not a fix for something. :)
 2011-06-30 20:12:22 +02:00
Guilherme Blanco
4603e94fe9 Fixed ClassMetadataFactory which was throwing an exception if parent class on inheritance hierarchy is an abstract class and also extends from a mapped superclass (so it contains an inheritance already), but is not in the discriminatorMap. 2011-06-30 15:04:57 -03:00
Johannes Schmitt
5701036068 added @Annotation to annotations 2011-06-30 11:03:32 +02:00
Benjamin Eberlei
6d035be3e3 Bump Dev Version to 2.1.0-DEV 2011-06-28 21:11:14 +00:00