Benjamin Eberlei
90b6d5e293
Merge branch 'master' of github.com:doctrine/doctrine2
2012-12-24 10:40:52 +01:00
Benjamin Eberlei
59ffbd5f8d
Merge branch 'DDC-2175'
2012-12-24 10:40:10 +01:00
Benjamin Eberlei
e2c1ff1a48
[DDC-2175] Fix bug in JoinedSubclassPersister
2012-12-24 10:39:23 +01:00
Benjamin Eberlei
904effcf4e
Merge pull request #538 from FabioBatSilva/identity-composite-key
...
IDENTITY() Support composite primary key
2012-12-24 01:19:05 -08:00
Benjamin Eberlei
7cf26950cc
Merge branch 'DDC-2187'
2012-12-24 10:15:47 +01:00
Klein Florian
8443eee628
use base events
2012-12-24 10:15:25 +01:00
Benjamin Eberlei
e319e34783
Merge pull request #528 from BenMorel/master
...
Documentation fixes
2012-12-23 12:22:09 -08:00
Benjamin Eberlei
d8b94b0527
Some text refactorings in tutorial
2012-12-23 13:05:54 +01:00
Fabio B. Silva
3d99711ac8
fix PHPDoc
2012-12-22 10:36:23 -02:00
Fabio B. Silva
99ab58febd
Fix CS
2012-12-22 10:36:23 -02:00
Fabio B. Silva
2e90cd9924
Identity function support composite primary key
2012-12-22 10:36:23 -02:00
Benjamin Eberlei
6f5948746e
Merge pull request #540 from FabioBatSilva/DDC-2208
...
[DDC-2208] Fix DDC-2208
2012-12-22 03:53:14 -08:00
Benjamin Eberlei
015771f10b
Merge pull request #541 from PSchwisow/master
...
Fix DDC-1690
2012-12-22 03:38:03 -08:00
Patrick Schwisow
0b21046fce
[DDC-1690] Added an empty line as requested.
2012-12-21 15:35:32 -06:00
Patrick Schwisow
bc6921504a
[DDC-1690] Created unit test
2012-12-21 14:32:10 -06:00
Fabio B. Silva
b6b493f450
test parentheses
2012-12-21 10:00:40 -02:00
Fabio B. Silva
eda43c77bb
Fix DDC-2208
2012-12-21 10:00:40 -02:00
Guilherme Blanco
a8340cc980
Merge pull request #146 from noginn/patch-1
...
Added missing "new" keyword for event listener
2012-12-21 03:46:51 -08:00
Guilherme Blanco
8b5e4a9a52
Merge pull request #542 from FabioBatSilva/DDC-2205
...
[DDC-2205] Fix DDC-2205
2012-12-21 03:45:07 -08:00
Fabio B. Silva
2104ae9935
fix DDC-2205
2012-12-20 23:06:30 -02:00
Patrick Schwisow
5627993827
Fix DDC-1690
...
Added the lines suggested by the original reporter.
2012-12-20 15:31:46 -06:00
Tom Graham
e17fc6c474
Added missing "new" keyword for event listener
2012-12-20 20:00:50 +00:00
Thomas Rothe
86c33d78d0
inheritance with composite keys
...
added tests for single table inheritance
2012-12-17 11:01:20 +01:00
Thomas Rothe
fb055ca75d
fixed problems with joined inheritance and composite keys
...
SchemaTool now creates all Id columns not just only the first one.
Insert statement for child entity now contains parameter for additional key columns only once.
2012-12-16 18:20:10 +01:00
Benjamin Eberlei
4bbfe0ce8a
Merge pull request #536 from KonstantinKuklin/master
...
add missed branch
2012-12-16 04:05:57 -08:00
Benjamin Eberlei
b6fd203355
Merge branch 'DDC-2199'
2012-12-16 12:58:01 +01:00
Benjamin Eberlei
7c337748b6
DDC-2199 / DDC-2192 - Versioned fields didnt work in XML/YAML mapping
2012-12-16 12:57:53 +01:00
Benjamin Morel
774bb3fec4
Fixed missed documentation issues in Doctrine\ORM
2012-12-14 20:12:56 +00:00
Benjamin Morel
aadce3c747
Fixed documentation for Doctrine\Tests
2012-12-14 18:55:49 +00:00
Benjamin Morel
c405f6d3f6
Fixed documentation for Doctrine\Tests\Mocks
2012-12-14 18:55:28 +00:00
Benjamin Morel
76f2ba50eb
Fixed documentation for Doctrine\Tests\DbalTypes
2012-12-14 18:55:16 +00:00
Konstantin Kuklin
8e2c060fc7
add missed branch
2012-12-14 18:04:19 +04:00
Benjamin Morel
ad967e8e22
Fixed documentation for Doctrine\ORM\Tools\Pagination
2012-12-14 13:13:22 +00:00
Benjamin Morel
2524c878b6
Fixed documentation for Doctrine\ORM\Tools\Export
2012-12-14 13:02:12 +00:00
Benjamin Morel
0122d8d36c
Fixed documentation for Doctrine\ORM\Tools\Event
2012-12-14 12:49:59 +00:00
Benjamin Morel
71e78014e5
Fixed documentation for Doctrine\ORM\Tools\Console
2012-12-14 12:49:05 +00:00
Benjamin Morel
e72445b836
Fixed documentation for Doctrine\ORM\Tools
2012-12-13 18:55:44 +00:00
Benjamin Morel
7869ec714d
Fixed unused 'use' statements.
...
Fixed missed documentation issues in Doctrine\ORM
2012-12-13 18:19:21 +00:00
Peter Hoffmann
4c1759eecb
Keyname was obviously changed in (latest) 2.3.1, cost me some hours to figure out, NOT cool!
2012-12-13 17:53:44 +01:00
Benjamin Morel
ba16789843
Fixed documentation for Doctrine\ORM\Query
2012-12-13 16:36:14 +00:00
Benjamin Morel
28966e2087
Fixed documentation for Doctrine\ORM\Query\Expr and Doctrine\ORM\Query\Filter
2012-12-13 12:05:34 +00:00
Benjamin Morel
d4357801a2
Fixed documentation for Doctrine\ORM\Query\Exec
2012-12-13 11:57:46 +00:00
Benjamin Morel
98ac6b5fec
Fixed documentation for Doctrine\ORM\Query\AST
2012-12-13 11:52:19 +00:00
Benjamin Morel
f743da0e02
Fixed documentation for Doctrine\ORM\Query\AST\Functions
2012-12-13 10:42:25 +00:00
Benjamin Morel
42e83a2716
Fixed documentation for ORM\Proxy
2012-12-13 10:28:55 +00:00
Mykola Zyk
ca1c6498ec
Update en/reference/query-builder.rst
...
Adding note for $append parameter of QueryBuilder::add() method.
2012-12-07 19:44:47 +02:00
Benjamin Eberlei
df1336dd26
Merge pull request #529 from francisbesset/options_join_columns
...
[DDC-2182] Options join columns
2012-12-04 04:29:01 -08:00
Francis Besset
657a54da84
Passed column options to the join column
2012-12-04 12:26:40 +01:00
Francis Besset
df2bfbb636
Fixed trailing spaces on SchemaTool
2012-12-04 12:23:55 +01:00
Benjamin Morel
43b301f22b
Fixed English mistakes
2012-12-03 11:02:29 +00:00
