Benjamin Eberlei
cbf210605a
[DDC-1290] Allow smallint and bigint for version fields
2011-07-26 22:24:16 +02:00
Benjamin Eberlei
2a59da1f03
Merge branch 'DDC-1276'
2011-07-26 22:15:37 +02:00
Benjamin Eberlei
a99ffc126f
DDC-1276 - Fix bug where merge managed and new entitiy share the same collection that is cascaded, cleared during the process and then empty afterwards.
2011-07-26 22:15:27 +02:00
Benjamin Eberlei
423651e45e
Merge branch 'master' of github.com:doctrine/doctrine2
2011-07-26 20:37:37 +02:00
Alexander
6cf7bdc2b7
Merge branch 'master' into DDC-551
2011-07-26 17:26:00 +02:00
Guilherme Blanco
1d9016e48f
Merge pull request #88 from asm89/DDC-1294
...
[DDC-1294] Add discriminator information to subselects
2011-07-26 08:14:36 -07:00
Alexander
97a4dbf2cd
[DDC-1294] Added more tests for subselects in subselects
2011-07-26 17:15:21 +02:00
kwiateusz
7261060905
Few more converts from assertTrue($a instance of $b) to assertInstanceOf
2011-07-26 15:22:57 +02:00
kwiateusz
1ea3e543ab
Correted indentation and variable name
2011-07-26 12:10:30 +02:00
kwiateusz
49c735109c
Change from assertType to assertInstanceOf.
...
Now PHPUnit doesn't show warning about deprecation of assertType.
Also some refractoring from assertTrue($a instanceof $b) to assertInstanceOf.
Leading \ in namespaces is not required so I removed it from few assertions.
2011-07-26 11:38:09 +02:00
Michel Weimerskirch
6ef4ac62d7
Missed another typo
2011-07-26 11:03:23 +03:00
Michel Weimerskirch
b58f573b31
Corrected typo
2011-07-26 10:59:21 +03: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
afd7a540a7
[DDC-551] Removed 'use ..DBAL\..\Type', causing full testsuite to fail
2011-07-22 15:10:31 +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
Guilherme Blanco
01d6ec35c4
Merge pull request #86 from kwiateusz/findByOne-patch
...
Now findByOne really retrieve only one entity adding limit to query
2011-07-21 10:01:21 -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
180dbbad8b
Merge branch 'EntityGenerator'
2011-07-12 23:46:13 +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
fb11268255
Merge branch 'DDC-1240'
2011-07-12 22:50:31 +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
409c16b898
Merge branch 'DDC-1250'
2011-07-09 22:12:15 +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
8b92dc5265
Merge branch 'DDC-1257'
2011-07-09 15:14:31 +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
305e0345ef
Merge branch 'DDC-1251'
2011-07-09 14:53:39 +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
689eaf3172
Merge branch 'DDC-1022'
2011-07-09 12:12:56 +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
9a68074878
Clarify possible problem
2011-07-08 14:42:15 +02: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
