Alexander
|
53386e5247
|
Merge branch 'master' into innerjoin-on-fetch-eager
Conflicts:
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
|
2011-10-31 22:24:16 +01:00 |
|
Benjamin Eberlei
|
231d84b625
|
Fix xml fix again
|
2011-10-31 22:15:08 +01:00 |
|
Alexander
|
22b3b46b61
|
Removed unnecessary spaces in generated SQL
|
2011-10-31 22:08:40 +01:00 |
|
Alexander
|
0f938b8c1d
|
Added tests for inner join generation with eager loading
|
2011-10-31 21:53:46 +01:00 |
|
Alexander
|
3994b80aa4
|
Fix TODO: Inner join when all join columns are NOT nullable.
|
2011-10-31 21:36:55 +01:00 |
|
Benjamin Eberlei
|
54217bd4c6
|
Merge branch 'DDC-1462'
|
2011-10-31 21:34:31 +01:00 |
|
Benjamin Eberlei
|
1dc5b7fba4
|
DDC-1462 - Fix bug in slice when calling on a dirty collection that is marked extra lazy
|
2011-10-31 21:34:22 +01:00 |
|
Benjamin Eberlei
|
3b819b52ca
|
Merge branch 'DDC-1399'
|
2011-10-31 21:17:09 +01:00 |
|
Benjamin Eberlei
|
95193ab5f8
|
DDC-1399 - Fix extra lazy collections when inner collection contains values but persistent collection is marked not dirty because of flush()
|
2011-10-31 21:17:01 +01:00 |
|
Benjamin Eberlei
|
11f82bd41f
|
DDC-1439 - Fix validate mapping some more
|
2011-10-31 20:49:59 +01:00 |
|
Guilherme Blanco
|
d444f0e06b
|
Micro optimization in SqlWalker.
|
2011-10-30 16:22:45 -02:00 |
|
Guilherme Blanco
|
c246c6b28b
|
AssignedGenerator optimization.
|
2011-10-30 16:07:43 -02:00 |
|
Guilherme Blanco
|
3cfa479c01
|
Micro optimization in computeChangeSet when using readOnly entities.
|
2011-10-30 15:46:07 -02:00 |
|
Benjamin Eberlei
|
67497ed834
|
Merge branch 'DDC-1384'
|
2011-10-30 16:48:00 +01:00 |
|
Benjamin Eberlei
|
64d405f7dd
|
Merge origin/master into DDC-1384
|
2011-10-30 12:12:18 +01:00 |
|
Benjamin Eberlei
|
94c288a6a8
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-10-30 08:26:03 +01:00 |
|
Benjamin Eberlei
|
2c036b3185
|
Fix glitch in testsuites tearDown()
|
2011-10-30 08:25:19 +01:00 |
|
Benjamin Eberlei
|
1bbec8dd33
|
Clarify error message
|
2011-10-30 00:25:49 +02:00 |
|
Benjamin Eberlei
|
30731e0727
|
DDC-1384 - Fix all tests on Oracle
|
2011-10-29 23:58:09 +02:00 |
|
Benjamin Eberlei
|
50e028212d
|
DDC-1384 - Fix a bunch of Oracle test failures
|
2011-10-29 20:42:44 +02:00 |
|
Benjamin Eberlei
|
fb55e8094b
|
DDC-1384 - Made tests case-insenstive to work with latest change regarding column sizes
|
2011-10-29 18:48:34 +02:00 |
|
Guilherme Blanco
|
96cb3d8004
|
Merge pull request #178 from adrienbrault/master
Fix Query iterate() doc return type
|
2011-10-29 06:39:27 -07:00 |
|
Adrien BRAULT
|
e39bfced4a
|
Fix iterate method doc return type
|
2011-10-29 13:40:01 +02:00 |
|
Guilherme Blanco
|
15562d030e
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-10-29 02:00:55 -02:00 |
|
Guilherme Blanco
|
0ec2cc557f
|
Implemented support to entities with association marked as @Id support in many situations. Fixed DDC-1435.
|
2011-10-29 02:00:35 -02:00 |
|
Benjamin Eberlei
|
f232e45efe
|
Merge branch 'DDC-1410'
|
2011-10-28 23:45:38 +02:00 |
|
Benjamin Eberlei
|
7be98f475e
|
DDC-1410 - Remove code-inlining that caused problems
|
2011-10-28 23:45:23 +02:00 |
|
Guilherme Blanco
|
3745e948c6
|
Made SimpleSelectExpression (Literal) be included as a scalar result. More general SQL Walker optimizations.
|
2011-10-28 14:25:12 -02:00 |
|
Guilherme Blanco
|
1f06e9fca5
|
Fixed issue with SimpleSelectExpression containing Literals. This issue is related to a previously fixed ticket DDC-1079.
|
2011-10-28 12:56:14 -02:00 |
|
Guilherme Blanco
|
7841ccb7c0
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-10-28 12:49:21 -02:00 |
|
Guilherme Blanco
|
1579c43433
|
Code beautification and docblocks enhancements.
|
2011-10-28 12:49:01 -02:00 |
|
Benjamin Eberlei
|
fbfd59afa0
|
Merge branch 'DDC-1454'
|
2011-10-28 00:50:30 +02:00 |
|
Benjamin Eberlei
|
f34eb83a7c
|
DDC-1454 - Fix exists() for Joined table inheritance
|
2011-10-28 00:50:10 +02:00 |
|
Benjamin Eberlei
|
8db1a09001
|
Merge branch 'master' of github.com:doctrine/doctrine2
|
2011-10-28 00:26:54 +02:00 |
|
Benjamin Eberlei
|
4a0227e5f2
|
Revert Expr\Base patch
|
2011-10-28 00:24:41 +02:00 |
|
Benjamin Eberlei
|
a98c7df2f1
|
Merge branch 'DDC-217'
|
2011-10-27 22:36:25 +02:00 |
|
Benjamin Eberlei
|
5918058d86
|
Merge origin/master
|
2011-10-27 22:36:06 +02:00 |
|
Guilherme Blanco
|
c5ef21864f
|
Fixed bug with fetch=EAGER associations that have already been hydrated during querying.
|
2011-10-26 15:04:49 -02:00 |
|
Benjamin Eberlei
|
cfe7ab46f2
|
Merge branch 'master' of git://github.com/doctrine/doctrine2
|
2011-10-25 22:55:08 +02:00 |
|
Benjamin Eberlei
|
3b9312e291
|
Bump DBAL version and make TestUtil more lenient
|
2011-10-25 22:54:20 +02:00 |
|
Benjamin Eberlei
|
a02b0c9269
|
Merge pull request #165 from armetiz/patch-3
Update lib/Doctrine/ORM/Query/Expr/Base.php
|
2011-10-24 03:42:04 -07:00 |
|
Benjamin Eberlei
|
0cdf1e042c
|
Merge pull request #173 from jaikdean/master
Fixed a couple of typos of 'discriminator'
|
2011-10-24 03:41:19 -07:00 |
|
Jaik Dean
|
cdb452b27b
|
Fixed typos of 'discriminator'
|
2011-10-24 10:01:27 +01:00 |
|
Benjamin Eberlei
|
a8052dec37
|
Added note about result cache changes
|
2011-10-23 23:35:04 +02:00 |
|
Benjamin Eberlei
|
adc4840cce
|
DDC-217 - Add support for QueryCacheProfiles and remove the old result caching code from ORM. Deprecate a bunch of methods in favor of using the AbstractQuery#getQueryCacheProfile method.
|
2011-10-23 23:28:23 +02:00 |
|
Benjamin Eberlei
|
993d6f5ac8
|
Merge pull request #171 from asm89/fix-mysql-tests
Fix mysql testsuite
|
2011-10-23 13:12:09 -07:00 |
|
Alexander
|
80c9690926
|
Fix mysql testsuite
|
2011-10-23 22:06:03 +02:00 |
|
Benjamin Eberlei
|
d9740e2028
|
Merge pull request #170 from asm89/fix-tests
Fix testsuite
|
2011-10-23 12:39:00 -07:00 |
|
Alexander
|
f1df4ffca4
|
Fix testsuite
|
2011-10-23 21:37:29 +02:00 |
|
Benjamin Eberlei
|
9b8d2d512b
|
Merge pull request #168 from dfreudenberger/master
postFlush event implementation
|
2011-10-23 01:12:27 -07:00 |
|