comfortablynumb
f0db9a842d
[DDC-1542] - Inheritance: Added default discriminator map (only annotations yet)
2012-05-04 20:36:24 +02:00
comfortablynumb
6d5f15e708
Merge remote branch 'upstream/master'
2011-12-23 13:30:36 -03:00
Guilherme Blanco
ec58285b3f
Merge pull request #236 from FabioBatSilva/DDC-1065
...
[DDC-1065] Error messages
2011-12-22 07:31:37 -08:00
Fabio B. Silva
c2cee0d6eb
error messages
2011-12-22 11:05:11 -02:00
Benjamin Eberlei
06de4e62a5
Add 2.2 to travis status icon list
2011-12-22 00:08:53 +01:00
Benjamin Eberlei
b91689fe2f
Update common with fix on interface detection
2011-12-21 23:57:33 +01:00
Benjamin Eberlei
f6f2acad4c
Merge Improve Error Messages into 2.2
2011-12-21 23:56:25 +01:00
Benjamin Eberlei
0551ccca92
Bump dev version to 2.2.01
2011-12-20 22:39:27 +01:00
Benjamin Eberlei
6136654dad
Release 2.2.0-BETA1
2011-12-20 22:39:27 +01:00
Benjamin Eberlei
9d906fa31e
Update build common
2011-12-20 22:39:12 +01:00
Benjamin Eberlei
dcaf1b5891
Prepare 2.2 beta
2011-12-20 22:38:38 +01:00
Benjamin Eberlei
9f81d5d077
Fix PEAR path
2011-12-20 21:55:58 +01:00
Alexander
d3e697143f
Merge pull request #234 from FabioBatSilva/testJoinQueries
...
Fix QueryTest#testJoinQueries order
2011-12-20 11:25:04 -08:00
Fabio B. Silva
e90545cef5
ORDER BY CmsArticle#topic
2011-12-20 17:22:14 -02:00
Fabio B. Silva
0a01b14830
fix QueryTest#testJoinQueries order
2011-12-20 16:14:01 -02:00
Guilherme Blanco
4bc014c696
Merge pull request #233 from FabioBatSilva/DDC-1539
...
[DDC-1539] Fix DDC-1539
2011-12-20 08:36:18 -08:00
Fabio B. Silva
e45ebbac46
remove white spaces
2011-12-20 10:40:29 -02:00
Fabio B. Silva
24dc74a800
Fixed DDC-1539
2011-12-20 10:31:00 -02:00
Guilherme Blanco
772f58a95b
Removed test since I'm unable to test now.
2011-12-20 00:48:19 -05:00
Guilherme Blanco
f6eb83705a
Added coverage to DDC-1521. Small CS changes.
2011-12-20 00:05:14 -05:00
Benjamin Eberlei
6c4aaab2d6
Merge branch 'TrailingWhitespaces'
2011-12-19 22:56:52 +01:00
Benjamin Eberlei
cd6131c9b8
Remove all trailing whitespaces
2011-12-19 22:56:19 +01:00
Benjamin Eberlei
f2d8102bbf
Fix bug in test, removed an assertion that is not necessary and violates sqlites autoincrement assumptions
2011-12-19 22:32:50 +01:00
Benjamin Eberlei
86f67788c5
Merge pull request #231 from FabioBatSilva/tmp2
...
[DDC 1213] bit comparison ( BIT_AND() , BIT_OR() )
2011-12-19 11:08:05 -08:00
Fabio B. Silva
ea5108ea0f
rebase upstream/master
2011-12-19 16:25:31 -02:00
Fabio B. Silva
5c89d7ffcb
support for bit comparison
2011-12-19 16:24:16 -02:00
Benjamin Eberlei
568698e321
Add dependency to doctrine-build-common and refactor build.xml and build.properties
2011-12-19 19:16:26 +01:00
Benjamin Eberlei
b545525e13
Update ORM to Doctrine Common master
2011-12-19 18:03:53 +01:00
Benjamin Eberlei
bf32125bad
DDC-1545 - Fix issue with changing values from null to something new.
...
This issue was introduced by a side-effect in 2.1.3 with
d9f9228d95c5ab2a200b3e2d2b358c598267afb1. In this commit read-only
objects where prevented to be updated. This lead to an invalid check not
being performed in UnitOfWork#computeChangeSet which was present before
where an association that was null would be injected into the
originalEntityData using the UnitOfWork#setOriginalEntityProperty()
method in the AbstractHydrator.
This commit now explicitly sets this field to null using the same API so
that is present during UnitOfWork#computeChangeSet.
2011-12-19 17:55:19 +01:00
Benjamin Eberlei
a9035e1533
Merge remote-tracking branch 'origin/master'
2011-12-19 17:11:19 +01:00
Guilherme Blanco
68663fac4b
Fixed issue when one to one badly populated when containing null values. Fixed DDC-1548.
2011-12-19 10:55:29 -05:00
Benjamin Eberlei
b1b10042d2
Revert "Fixed issue with fetched association not being considered during changeSet calculation. Fixes DDC-1545."
...
This reverts commit a8478d5766
2011-12-19 16:31:26 +01:00
comfortablynumb
bf9024b622
Merge remote branch 'upstream/master'
2011-12-19 11:09:09 -03:00
Alexander
108cb53eef
Merge pull request #229 from bschussek/DDC-1545
...
DDC-1545
2011-12-19 03:22:49 -08:00
Bernhard Schussek
e035fe7949
Fixed class name of test for DDC-1545
2011-12-19 11:20:37 +01:00
Benjamin Eberlei
40800bd3cd
DDC-1530 - Validate field types in SchemaValidator
2011-12-19 10:11:11 +01:00
Alexander
4f67ea3869
Merge pull request #228 from asm89/ddc-551-parameter-inference
...
Fixed testsuite
2011-12-19 01:02:30 -08:00
Alexander
8c6c49a6ee
Fixed testsuite
2011-12-19 09:55:49 +01:00
Benjamin Eberlei
7f8f39168a
Merge pull request #227 from asm89/ddc-551-parameter-inference
...
[DDC-551] Add type inference to SQLFilter::setParameter() + cleaned tests
2011-12-19 00:47:58 -08:00
Alexander
bd07f8d3dd
[DDC-551] Add type inference to SQLFilter::setParameter() + cleaned tests
2011-12-19 08:43:42 +01:00
Guilherme Blanco
a8478d5766
Fixed issue with fetched association not being considered during changeSet calculation. Fixes DDC-1545.
2011-12-19 01:39:48 -05:00
Guilherme Blanco
f6d9344d89
Merge pull request #219 from FabioBatSilva/DDC-1468
...
Fixed DDC-1468
2011-12-18 19:20:33 -08:00
Benjamin Eberlei
91e700a70e
Merge pull request #226 from asm89/ddc-1505
...
[DDC-1505] joinColumn "nullable" should be handled true by default
2011-12-18 12:59:49 -08:00
Alexander
de769c6c3c
[DDC-1505] joinColumn "nullable" should be handled true by default
2011-12-18 21:33:38 +01:00
Benjamin Eberlei
29fabbd81f
Merge pull request #225 from asm89/fix-pgsql-testsuite
...
[DDC-551] Fix testcase on pgsql
2011-12-18 10:59:35 -08:00
Alexander
5160bdc1a8
[DDC-551] Fix testcase on pgsql
2011-12-18 19:58:32 +01:00
Benjamin Eberlei
003d1410b0
Merge pull request #224 from doctrine/DDC-551
...
DDC-551 - Filter branch
2011-12-18 08:03:23 -08:00
Bernhard Schussek
9b877499c7
Added test case for DDC-1545
2011-12-18 12:13:58 +01:00
Benjamin Eberlei
9cd8f85a8c
DDC-1456 - Disallow setting id generators on composite identifiers.
2011-12-18 00:32:35 +01:00
Benjamin Eberlei
072094f722
DDC-1368 - Fix tests
2011-12-17 23:38:39 +01:00
