Benjamin Eberlei
|
3cc5fc0252
|
[DDC-2660] Fix error with NativeSQL, ResultSetMappingBuilder and Associations as Primary Key.
|
2013-09-08 14:39:25 +02:00 |
|
Benjamin Eberlei
|
fd0657089a
|
Merge branch 'DDC-2661' into 2.4
|
2013-09-08 10:38:03 +02:00 |
|
Benjamin Eberlei
|
de3b237292
|
[DDC-2661] Fix bug in YamlDriver not passing options from id to mapField()
|
2013-09-08 10:37:42 +02:00 |
|
Benjamin Eberlei
|
1221cc3a2a
|
More excludes
|
2013-09-07 18:27:20 +02:00 |
|
Benjamin Eberlei
|
9efbc1fa71
|
Bump version to 2.4.1
|
2013-09-07 18:19:57 +02:00 |
|
Benjamin Eberlei
|
57705e0d78
|
Release 2.4.0
|
2013-09-07 18:19:56 +02:00 |
|
Benjamin Eberlei
|
82bb6b78cd
|
Travis should prefer dist.
|
2013-09-07 13:20:35 +02:00 |
|
Benjamin Eberlei
|
64c56b21aa
|
Remove minimum stability from 2.4 composer.json
|
2013-09-07 13:08:14 +02:00 |
|
Benjamin Eberlei
|
b04e2e6364
|
Adjust composer.json to pending 2.4 stable release
|
2013-09-07 12:59:17 +02:00 |
|
Benjamin Eberlei
|
a70f9b7f49
|
Fix branch alias
|
2013-09-07 12:57:56 +02:00 |
|
Benjamin Eberlei
|
c88a7c1ffe
|
New Build process
- Switch from Phing to Ant
- Remove PEAR packaging
- Add Composer archiving
|
2013-09-07 12:57:38 +02:00 |
|
Benjamin Eberlei
|
c206728c96
|
Merge branch 'DDC-2638' into 2.4
|
2013-09-07 09:04:34 +02:00 |
|
Attila Fulop
|
e8d420c641
|
Fix for entity generator discriminator column
|
2013-09-07 09:04:26 +02:00 |
|
Benjamin Eberlei
|
fdcab7eae8
|
Merge branch 'DDC-2640' into 2.4
|
2013-09-07 09:01:01 +02:00 |
|
Maks Feltrin
|
45d7d5234f
|
DO NOT OVERRIDE CUSTOM TREE WALKERS IN getIterator()
|
2013-09-07 09:00:06 +02:00 |
|
Benjamin Eberlei
|
159ca79b81
|
Merge origin/2.4 into local branch
|
2013-09-07 08:55:15 +02:00 |
|
Benjamin Eberlei
|
2b148a27e0
|
Merge Oracle test fixes to 2.4 branch
|
2013-09-07 08:54:23 +02:00 |
|
Guilherme Blanco
|
0aef57f60c
|
Fixing missing table aliases when using Many2Many persister.
|
2013-08-26 10:29:45 -04:00 |
|
Benjamin Eberlei
|
fef1e0286c
|
Merge branch 'DDC-2235' into 2.4
|
2013-08-20 10:08:21 +02:00 |
|
Guilherme Blanco
|
4a38534150
|
Fixed DDC-2235.
|
2013-08-20 10:08:07 +02:00 |
|
Benjamin Eberlei
|
1de22adb16
|
Merge branch 'DDC-2506' into 2.4
|
2013-08-20 09:56:54 +02:00 |
|
Guilherme Blanco
|
62b4160887
|
Fixed DDC-2506 by manually updating code. Closes PR #708.
|
2013-08-20 09:56:39 +02:00 |
|
Benjamin Eberlei
|
dbb7c4d2bf
|
Merge branch 'DDC-2607' into 2.4
|
2013-08-20 09:51:19 +02:00 |
|
Dustin Thomson
|
e8978ee365
|
Modified executeInserts method in JoinedSubclassPersister to only check for the presence of columns in a composite primary key
|
2013-08-20 09:51:01 +02:00 |
|
Benjamin Eberlei
|
c095b88804
|
Merge branch 'DDC-2578' into 2.4
|
2013-08-10 18:14:24 +02:00 |
|
Guilherme Blanco
|
efe4208ba6
|
Kept BC.
|
2013-08-10 18:14:07 +02:00 |
|
Guilherme Blanco
|
453a56670d
|
Modified Hydrators to be per-query instances instead of a singleton-like approach.
|
2013-08-10 18:14:07 +02:00 |
|
Benjamin Eberlei
|
ec36e2c866
|
Merge branch 'DDC-2579' into 2.4
|
2013-08-10 17:54:37 +02:00 |
|
Fabio B. Silva
|
e250572cb4
|
fix DDC-2579
|
2013-08-10 17:53:50 +02:00 |
|
Benjamin Eberlei
|
758955e183
|
Merge branch 'DDC-2582' into 2.4
|
2013-08-10 17:48:20 +02:00 |
|
Guilherme Blanco
|
5b8d6a1486
|
CS fixes.
|
2013-08-10 17:48:03 +02:00 |
|
Guilherme Blanco
|
3f1003fee9
|
Fixed DDC-1884.
|
2013-08-10 17:48:03 +02:00 |
|
Benjamin Eberlei
|
7e241e89b8
|
Merge branch 'DDC-2548' into 2.4
|
2013-08-10 17:43:40 +02:00 |
|
Michaël Gallego
|
67c1e1d2b1
|
Allow to have non-distinct queries
|
2013-08-10 17:43:26 +02:00 |
|
Benjamin Eberlei
|
261eacdbfc
|
Merge branch 'DDC-2565' into 2.4
|
2013-08-10 17:27:47 +02:00 |
|
Austin Morris
|
43df821691
|
convert PersistentCollection functional tests to unit tests
|
2013-08-10 17:27:30 +02:00 |
|
Austin Morris
|
11d09702da
|
remove redundant require_once for TestInit.php
|
2013-08-10 17:27:30 +02:00 |
|
Austin Morris
|
f9f14139cf
|
do not initialize coll on add()
|
2013-08-10 17:27:30 +02:00 |
|
Austin Morris
|
39f4d46d36
|
Initialize coll when using Collection methods inside PersistentCollection
|
2013-08-10 17:27:30 +02:00 |
|
Austin Morris
|
1dae8d318f
|
PersistentCollection - initialize coll - create failing tests
|
2013-08-10 17:27:30 +02:00 |
|
Benjamin Eberlei
|
a361a7c1cb
|
Merge branch 'DDC-2542' into 2.4
|
2013-08-10 17:02:34 +02:00 |
|
Roger Llopart Pla
|
6a73608baf
|
Fixed name colision.
|
2013-08-10 17:02:10 +02:00 |
|
Roger Llopart Pla
|
f9955152b2
|
Added a test which verifies that the tree walkers are kept.
|
2013-08-10 17:02:10 +02:00 |
|
Roger Llopart Pla
|
5aad1df149
|
Added docblock.
|
2013-08-10 17:02:10 +02:00 |
|
Roger Llopart Pla
|
243832555b
|
Appending the Paginator tree walker hint, instead of removing all the other hints.
|
2013-08-10 17:02:10 +02:00 |
|
Benjamin Eberlei
|
ae12fa6b5b
|
Merge branch 'DDC-2577' into 2.4
|
2013-08-10 16:28:35 +02:00 |
|
Konstantin.Myakshin
|
edaf9b6813
|
Skip not mapped public properties in SchemaValidator
|
2013-08-10 16:28:27 +02:00 |
|
Benjamin Eberlei
|
b324a21abf
|
Merge branch 'DDC-2587' into 2.4
|
2013-08-10 16:25:04 +02:00 |
|
J. Bruni
|
ff34aaaa2c
|
Updated EntityGeneratorTest::testEntityTypeAlias
|
2013-08-10 16:24:43 +02:00 |
|
J. Bruni
|
9767a814a6
|
Updated EntityGeneratorTest::testEntityTypeAlias
|
2013-08-10 16:24:43 +02:00 |
|