Alexander
|
be48821e86
|
Merge remote-tracking branch 'origin/master' into DDC-551
Conflicts:
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
lib/Doctrine/ORM/Query.php
|
2011-11-23 22:43:42 +01:00 |
|
Alexander
|
68027e1b5f
|
Merge remote-tracking branch 'upstream/master'
|
2011-11-23 22:31:17 +01:00 |
|
Guilherme Blanco
|
ef33454301
|
Reverted PR which broke suite. Issue is still valid, but it requires more investigation.
|
2011-11-23 08:40:47 -05:00 |
|
Guilherme Blanco
|
bfcea9460b
|
Merge pull request #202 from realestateconz/master
Fixed array flip breaking discriminator map SQL generation
|
2011-11-22 18:36:30 -08:00 |
|
warezthebeef
|
b80ef58cab
|
Fixed array_flip breaking discriminator map SQL generation
|
2011-11-23 12:15:23 +13:00 |
|
Benjamin Eberlei
|
be4eb63c62
|
Merge branch 'DBAL-15'
|
2011-11-21 21:38:05 +01:00 |
|
jsor
|
16aa558292
|
Remove sql conversion from where clauses and update statements
|
2011-11-21 15:08:36 +01:00 |
|
Benjamin Eberlei
|
135e515e7f
|
DDC-1500 - Fix potential security problem in EntityRepository ORDER BY orientations
|
2011-11-21 15:04:46 +01:00 |
|
Guilherme Blanco
|
7ca43b72c9
|
Merge pull request #201 from jonathaningram/patch-1
Fixed typo
|
2011-11-21 05:16:40 -08:00 |
|
Jonathan Ingram
|
248c9bdeff
|
Fixed typo
|
2011-11-21 12:34:20 +11:00 |
|
Jan Sorgalla
|
4042bc53ce
|
Fix argument on wrong method call
|
2011-11-20 19:57:04 +01:00 |
|
Jan Sorgalla
|
841d12e9b6
|
Move check for conversion SQL to ClassMetadataInfo
|
2011-11-20 19:50:51 +01:00 |
|
Vitali
|
507c8f45b4
|
Register DoctrineAnnotations on call to OrmTestCase::createAnnotationDriver()
|
2011-11-20 17:02:15 +03:00 |
|
Benjamin Eberlei
|
bda593a66d
|
DDC-1448 - Add support for ObjectManagerAware interface and PersistentObject in ORM
|
2011-11-19 13:06:24 +01:00 |
|
Benjamin Eberlei
|
8eaf160ead
|
Update Doctrine Common Vendor
|
2011-11-19 09:29:32 +01:00 |
|
Benjamin Eberlei
|
53b3030aa2
|
Clarify EntityManager#transactional() docblock
|
2011-11-19 08:58:58 +01:00 |
|
Benjamin Eberlei
|
dc0a03ab30
|
DDC-1400 working testcase
|
2011-11-19 08:50:49 +01:00 |
|
Jan Sorgalla
|
6f35679911
|
Initial implementation of Doctrine\DBAL\Types\Type::convertToDatabaseValueSQL() and Doctrine\DBAL\Types\Type::convertToPHPValueSQL() integration
|
2011-11-19 00:35:29 +01:00 |
|
Benjamin Eberlei
|
f9a4dcb2d0
|
Remove code that could allow users of xml and yaml to define orphan removal on the wrong association sides.
|
2011-11-18 18:33:03 +01:00 |
|
Benjamin Eberlei
|
a0d6d84a4f
|
Merge branch 'DBAL-171'
|
2011-11-18 17:42:38 +01:00 |
|
Benjamin Eberlei
|
166c05dfaa
|
Fix tests to be more stable
|
2011-11-18 17:42:32 +01:00 |
|
Benjamin Eberlei
|
ab4d3c3a09
|
Merge branch 'DBAL-171'
|
2011-11-18 17:30:26 +01:00 |
|
Benjamin Eberlei
|
9e8a950f2e
|
DBAL-171 - Fix bug where params where resorted but types where not in DQL Query
|
2011-11-18 17:29:31 +01:00 |
|
Benjamin Eberlei
|
0d4e0626cf
|
Merge pull request #158 from goetas/cascade-all
Collapsed cascade elements, if cascade-all.
|
2011-11-18 06:49:40 -08:00 |
|
Benjamin Eberlei
|
ef0a901cf5
|
Merge branch 'DDC-1496'
|
2011-11-18 15:44:19 +01:00 |
|
Benjamin Eberlei
|
ceadc95439
|
DDC-1496 - Fix bug with OneToMany collections having orphanRemoval=true and Collection#clear() being called.
|
2011-11-18 15:44:06 +01:00 |
|
Benjamin Eberlei
|
61e371cbdc
|
DDC-1069 - Fix error in docblocks of query builder
|
2011-11-18 14:43:47 +01:00 |
|
Benjamin Eberlei
|
b44ff9b849
|
Merge pull request #194 from FabioBatSilva/DDC-1430-PGSQL-TEST
DDC-1430 - fix broken test on postgres
|
2011-11-18 05:14:15 -08:00 |
|
Benjamin Eberlei
|
2187f33477
|
Add test for DDC-1436 and DDC-1452 showing they are the same issues
|
2011-11-18 13:28:56 +01:00 |
|
Fabio B. Silva
|
f4da4591fa
|
fix broken test on postgres
|
2011-11-16 09:48:11 -02:00 |
|
Benjamin Eberlei
|
43b1e79ec4
|
Merge pull request #193 from FabioBatSilva/DDC-1430
DDC 1430
|
2011-11-15 14:47:45 -08:00 |
|
Fabio B. Silva
|
aeb2ab132b
|
group by all fields when entity has foreign keys
|
2011-11-15 20:27:45 -02:00 |
|
Fabio B. Silva
|
4cbd5eac95
|
Test Foreign Keys
|
2011-11-15 18:54:53 -02:00 |
|
Benjamin Eberlei
|
2d14be86f3
|
Merge pull request #192 from FabioBatSilva/DDC-1474
DDC-1474
|
2011-11-15 12:10:19 -08:00 |
|
Fabio B. Silva
|
08edf34057
|
move tests to SelectSqlGenerationTest
|
2011-11-15 17:27:17 -02:00 |
|
Benjamin Eberlei
|
9916f34262
|
Merge pull request #191 from FabioBatSilva/DDC1430
DDC-1430
|
2011-11-15 11:07:30 -08:00 |
|
Benjamin Eberlei
|
a0ee72f264
|
Fix bug introduced in recent XmlDriver commit
|
2011-11-15 20:03:56 +01:00 |
|
Fabio B. Silva
|
3f8347a4d9
|
fixed DDC-1474
|
2011-11-15 17:00:19 -02:00 |
|
Guilherme Blanco
|
14f20c16bc
|
Changed the RSM to make is behavior as mixed if you alias an entity.
|
2011-11-15 15:14:57 -02:00 |
|
Fabio B. Silva
|
3dd5d14977
|
Fixed DDC-1430
|
2011-11-15 14:28:57 -02:00 |
|
Guilherme Blanco
|
77e076f1fd
|
Fixed DDC-1492.
|
2011-11-15 01:10:27 -02:00 |
|
Guilherme Blanco
|
45d95ad130
|
Fixed wrong indentation by my previous commit.
|
2011-11-15 01:09:48 -02:00 |
|
Benjamin Eberlei
|
9b32a2d87a
|
DDC-1452 - Fix missing fetched parameter in BasicEntityPersister
|
2011-11-14 23:37:02 +01:00 |
|
Benjamin Eberlei
|
3e95eed76e
|
Merge branch 'DDC-1452'
|
2011-11-14 23:06:00 +01:00 |
|
Benjamin Eberlei
|
34c94dbd94
|
DDC-1452 - Fixed bug with multiple fetch joins of the same "propery-path" of Class+field name combinations
|
2011-11-14 23:05:33 +01:00 |
|
Benjamin Eberlei
|
98033cc878
|
Merge branch 'master' into DDC-1452
|
2011-11-14 21:53:36 +01:00 |
|
Benjamin Eberlei
|
909504c074
|
DDC-1461 - Fix test failures
|
2011-11-14 21:05:44 +01:00 |
|
Benjamin Eberlei
|
4c7e4296c9
|
Merge pull request #189 from FabioBatSilva/DDC-1404
DDC-1404
|
2011-11-14 10:32:31 -08:00 |
|
Benjamin Eberlei
|
1b7eacd9fa
|
Merge pull request #188 from FabioBatSilva/DDC-1476
DDC-1476
|
2011-11-14 10:31:30 -08:00 |
|
Fabio B. Silva
|
8af0f9d071
|
added support for Inherited Named Queries
|
2011-11-14 16:07:37 -02:00 |
|