bilouwan
e8f40f58a1
Fix compatibility with php5.4
2015-11-30 10:35:42 +01:00
Guilherme Blanco
8ea62b95b8
Tests around reported cases over DDC-2524
2015-11-27 18:44:23 +00:00
bilouwan
832adae6b4
Unit test & fix for merge versionned entity
2015-11-27 17:28:45 +01:00
Guilherme Blanco
599f99471e
Merge pull request #1571 from montaniasystemab/patch-1
...
Fixed typo in QueryBuilder->where() docblock
2015-11-26 15:30:56 -05:00
montaniasystemab
b48fca543c
Fixed typo in QueryBuilder->where() docblock
2015-11-26 10:01:29 +01:00
Guilherme Blanco
57b22bd646
Merge pull request #1568 from guiwoda/patch-ddc-3967
...
Identifier is cached with wrong type
2015-11-24 22:17:59 -05:00
Guido Contreras Woda
e3627f1886
Test that reflects the issue described in http://www.doctrine-project.org/jira/browse/DDC-3967
2015-11-24 10:35:31 -03:00
Marco Pivetta
b980e98ba3
Merge pull request #1566 from BenMorel/typofix
...
Fix typos in DQL doc
2015-11-23 14:27:26 +01:00
Benjamin Morel
6d8778fd69
Fix typos in DQL doc
2015-11-23 12:18:18 +01:00
David McKay
f8ba3a3434
Fixing method name 'rollBack', which was documented as 'rollback'
2015-11-21 18:18:56 +00:00
Guilherme Blanco
3cff0f88bd
Merge pull request #1562 from deeky666/fix-empty-expression
...
Fix empty expression on PHP 5.4
2015-11-19 10:45:21 -05:00
Steve Müller
e0cb90d426
fix empty expression on PHP 5.4
2015-11-19 16:43:33 +01:00
Marco Pivetta
9c5cea3e95
Merge pull request #1561 from deeky666/DDC-4006
...
[DDC-4006] Inherit ID generator strategy mapping from embeddables
2015-11-19 16:34:32 +01:00
Guilherme Blanco
22e76e8624
Merge pull request #1559 from guiwoda/wrong-entity-cache-read-inheritance
...
Entity cache key is built differently on read than on write
2015-11-19 10:30:37 -05:00
Steve Müller
86c81da7ce
inherit ID generator strategy mapping from embeddables
2015-11-19 16:10:48 +01:00
Guido Contreras Woda
6c96e23a47
Test to verify the bug and the fix
2015-11-19 12:02:51 -03:00
Guilherme Blanco
0b45d96c74
Merge pull request #1560 from gitname/patch-2
...
Fix broken links
2015-11-17 21:40:13 -05:00
gitname
001d5b7ed3
Fix relative links
...
Fix 2 relative links to other docs files
2015-11-17 12:30:32 -08:00
Guido Contreras Woda
427642aaba
Entity cache key is built differently on read than on write
2015-11-17 16:10:17 -03:00
Guilherme Blanco
84eb175dbf
Merge pull request #1436 from dadamssg/DDC-3785
...
allow ManyToManyPersister to handle custom identification types
2015-11-15 22:24:01 -05:00
Guilherme Blanco
50ee47cc70
Merge pull request #1492 from nicolas-grekas/doc-fix
...
Fix misleading docblock example
2015-11-15 22:19:27 -05:00
Guilherme Blanco
04789dfec7
Merge pull request #1443 from meeuw/unsigned
...
Unsigned
2015-11-15 22:16:15 -05:00
Guilherme Blanco
7fc36b4110
Merge pull request #1450 from davidfuhr/doc-version
...
Link annotation ref to locking explanation
2015-11-15 22:14:36 -05:00
Guilherme Blanco
cdfcca2ff2
Merge pull request #1455 from xoeoro/patch-1
...
Update ExprTest.php
2015-11-15 22:12:36 -05:00
Guilherme Blanco
9f93999758
Merge pull request #1487 from xxccdef/DDC-3864
...
[DDC-3864] Support any ordering of fields in partial object query with embeddable
2015-11-15 22:03:25 -05:00
Guilherme Blanco
e8acfb5891
Merge pull request #1481 from mikeSimonson/composer-bin-fix
...
Remove the execution bit on the bin/doctrine.php
2015-11-15 22:02:19 -05:00
Guilherme Blanco
5ec9a62e2b
Merge pull request #1558 from doctrine/DDC-3922
...
[RFC] remove indexes overruled by primary key
2015-11-15 22:01:05 -05:00
vershnik
96398ba30f
remove indexes overruled by primary key
...
There can be unique indexes automatically created for join column.
If join column is also primary key we should keep only primary key on this column.
Oracle does not allow having both unique index and primary key on the same column, it is useless for mysql too.
(Previously it was done by DBAL, but now it allows duplicate indexes)
2015-11-16 02:49:41 +00:00
Guilherme Blanco
c561223d1b
Merge pull request #1557 from gitname/patch-1
...
Reduce ambiguity in Entities description
2015-11-15 21:25:30 -05:00
gitname
8192d5bb3e
Reduce ambiguity in Entities description
2015-11-15 13:27:51 -08:00
Jan Langer
91ce78815f
Second level cache stores identifier with correct type even if findById is called with wrong identifier type
2015-11-14 11:17:16 +01:00
Guilherme Blanco
71bb27a62f
Merge pull request #1555 from doctrine/DDC-3979
...
[RFC] DDC-3979
2015-11-13 11:38:55 -05:00
Guilherme Blanco
e64f44ec9b
Fix one to one inverse side cached entity association key generation
2015-11-13 15:58:52 +00:00
Marco Pivetta
802cc82c8d
Merge pull request #1554 from tai2/fix_document_transactional
...
Fix a documentation error.
2015-11-13 07:00:30 +01:00
tai2
50d87bd111
Fix a documentation error.
2015-11-13 12:07:21 +09:00
Guilherme Blanco
3a44a3dada
Merge pull request #1551 from doctrine/DDC-3976
...
[RFC] DDC-3976
2015-11-12 10:21:37 -05:00
Marco Pivetta
3452f5ccc3
Merge pull request #1553 from OskarStark/patch-1
...
doc fix
2015-11-12 11:50:15 +01:00
Oskar Stark
d49cd4aa1e
doc fix
2015-11-12 11:45:37 +01:00
Guilherme Blanco
58992ad523
Fixed support for inverse side second level cache
2015-11-12 05:00:08 +00:00
Guilherme Blanco
089a0ac60b
Merge pull request #1552 from guiwoda/l2-invalid-collection-cache-key
...
Collection cache key is built differently on read than on write
2015-11-11 10:22:46 -05:00
Guido Contreras Woda
d57ecc12c0
Collection cache key is built differently on read than on write
2015-11-11 12:10:29 -03:00
Guilherme Blanco
1187c51a89
Merge pull request #1529 from tkleinhakisa/2.1-upgrade
...
Update Upgrade.md after minor bc break in 2.5.0
2015-11-08 22:54:20 -05:00
Guilherme Blanco
46dec5478a
Merge pull request #1505 from qu1m/master
...
Fixed issue with entity manager when using LockMode::NONE
2015-11-08 22:51:38 -05:00
Guilherme Blanco
49bb687aaf
Merge pull request #1540 from pantelm/master
...
[DDC-3711] Correct Error on manyToMany with composite primary key + add Tests
2015-11-08 22:43:36 -05:00
Guilherme Blanco
664925d7f4
Merge pull request #1550 from doctrine/cache-for-travis
...
[RFC] Added composer cache on travis
2015-11-08 22:41:48 -05:00
Guilherme Blanco
370dbf12de
Added composer cache on travis
2015-11-09 03:40:18 +00:00
Guilherme Blanco
3e0529db53
Merge pull request #1493 from alireza-m/master
...
Pass orderings, maxRresults and firstResult when call getHash
2015-11-08 22:36:06 -05:00
Guilherme Blanco
bad0f17c10
Merge pull request #1549 from doctrine/DDC-3697
...
[RFC] DDC-3697
2015-11-08 22:30:50 -05:00
Guilherme Blanco
443259f629
Some extra refinement over patch
2015-11-09 03:19:11 +00:00
Matthias Pigulla
b7bd42638d
Fix for DDC-3697 and DDC-3701
...
Also fix Lexer::match() so it does not accept T_WHERE when T_WITH is supposed to be matched. (DDC-3701)
2015-11-09 03:19:11 +00:00