RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-09 10:37:09 +03:00
Code Issues Projects Releases Wiki Activity
8,402 Commits 5 Branches 0 Tags 32 MiB
d7b917aa49
Commit Graph

4878 Commits

Author SHA1 Message Date
Wouter J
d7b917aa49 Fixed InputOption modes 2014-02-09 15:10:00 +01:00
Benjamin Eberlei
53a5a48aed [DDC-2624] Fix bug when persistent collection is cloned and used in a new entity. 2014-02-09 14:27:42 +01:00
Jan Kramer
43e37d4f2f Throw exception on embeddables in embeddables. 2014-02-09 10:09:28 +01:00
Benjamin Eberlei
50ba19d91b Merge pull request #937 from goetas/contains-key 
Extra-lazy for containsKey on collections
 2014-02-08 16:28:44 +01:00
Benjamin Eberlei
8a0901c92b Merge pull request #835 from schmittjoh/ValueObjects 
Value objects (Based on #634)
 2014-02-08 16:24:47 +01:00
Benjamin Eberlei
8e3f4561c0 Merge pull request #858 from schmittjoh/rsmBuilder 
lifts an unnecessary restriction on ResultSetMappingBuilder
 2014-02-08 16:23:18 +01:00
Benjamin Eberlei
058e024f0e Merge pull request #902 from gwagner/master 
Fix Lifecycle Callbacks
 2014-02-08 16:01:13 +01:00
Benjamin Eberlei
31a2870c3f Merge pull request #912 from BenMorel/collection-count 
Avoid PersistentCollection::isEmpty() to fully load the collection.
 2014-02-08 16:00:10 +01:00
Benjamin Eberlei
960fbfc110 Merge pull request #908 from FabioBatSilva/DDC-2862 
[DDC-2862][SLC] Fix lazy association load
 2014-02-08 15:55:20 +01:00
Benjamin Eberlei
b76e95cbb9 Merge pull request #917 from doctrine/hotfix/DDC-2931 
DDC-2931 - one-to-one self-referencing association broken by DCOM-96
 2014-02-08 15:46:07 +01:00
Benjamin Eberlei
105d9e998b Merge pull request #927 from timdev/timdev-fixes 
s/EntityManager/EntityManagerInterface/ in a few places
 2014-02-08 15:30:15 +01:00
Benjamin Eberlei
f07c576e5f Merge pull request #932 from deeky666/DDC-2919 
[DDC-2919] Make lock mode usage consistent
 2014-02-08 15:27:35 +01:00
Benjamin Morel
496f9a0176 Avoid PersistentCollection::isEmpty() to fully load the collection on extra lazy fetch. 2014-02-08 13:49:48 +00:00
shustrik
b167a64544 remove doc 2014-02-06 20:08:07 +03:00
shustrik
12985b7811 add iterator to tree walker chain 2014-02-06 19:39:40 +03:00
Asmir Mustafic
1d40c85c3c Right owning side column selection 2014-02-06 14:26:06 +01:00
shustrik
6fe40b055f fix return walker 2014-02-06 16:18:35 +03:00
shustrik
a6b43b93ac fix TreeWalkerChain. 
Create walker object in foreach.
 2014-02-06 16:06:00 +03:00
Asmir Mustafic
2eb428df79 code style 2014-02-06 12:55:33 +01:00
Asmir Mustafic
724e69146c typos and removed confusing ternary 2014-02-06 12:44:13 +01:00
Asmir Mustafic
557686aa0a Entra-lazy for containsKey on collections 2014-02-06 12:27:12 +01:00
Steve Müller
a6c8ab8a5f make lock mode usage consistent 2014-02-05 15:13:53 +01:00
Tim Lieberman
25d71462e3 Make SchemaTool and SchemaValidator use EntityManagerInterface instead of EntityManager 2014-02-01 05:11:20 +00:00
Marco Pivetta
e322ab4deb DDC-2931 - Removing previous broken fix for DDC-2931 - hardened 2014-02-01 02:00:10 +01:00
Marco Pivetta
7a32eca039 DDC-2931 - Safe comparison between proxies and entities when refreshing objects 2014-02-01 01:57:51 +01:00
Tim Lieberman
bf9fbd896b Substitute EntityManagerInterface for EntityManager in Console EntityManagerHelper 2014-02-01 00:23:23 +00:00
Tim Lieberman
43d94e7b5e Console EntityManagerHelper now accepts EntityManagerInterface as constructor argument, instead of insisting on an EntityManager 2014-01-31 15:32:31 -08:00
Fabio B. Silva
7e5a1c6b0d Fix lazy association load 2014-01-28 12:26:10 -05:00
Marco Pivetta
596d2070ed DDC-2931 - Removing refresh hints when fetching association data in hydrators 2014-01-24 02:45:28 +01:00
Steve Müller
b9ff877f14 fix SQL generation on table lock hint capable platforms 2014-01-15 22:46:09 +01:00
Geoffrey Wagner
b863b9b957 Fix some code standard things 2014-01-12 17:14:32 -06:00
Geoffrey Wagner
e9739f8591 Fix some code standard things 2014-01-09 10:48:38 -06:00
Geoffrey Wagner
4772cbfae6 Add a test 
addLifecycleCallback now only allows a callback once so we do not hook them twice
 2014-01-08 20:58:50 -06:00
Geoffrey Wagner
db31c58102 Fix Lifecycle Callbacks 
Remove a bit of code that breaks lifecycle callbacks of parent MappedSuperclasses
 2014-01-08 17:17:47 -06:00
Guilherme Blanco
b65d9e6c83 Merge pull request #896 from holtkamp/patch-2 
Ensure <cascade/> elements preceed <join-columns/>
 2014-01-05 11:32:31 -08:00
Menno Holtkamp
fc2b9980ae Exclude exporting inheritanceType for INHERITANCE_TYPE_NONE 2014-01-05 18:53:31 +01:00
Menno Holtkamp
797fb9c34a Respected 'inheritanceType' at Entity level 
It was (incorrectly) fetched from Table-level.
http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/annotations-reference.html#annref-inheritancetype
 2014-01-05 18:41:55 +01:00
Menno Holtkamp
85a16f9f28 Ensure <cascade/> elements preceed <join-columns/> 
When converting annotations based metadata to XML, the position of the <cascade/> elements resulted in XSD validation errors caused by the definitions of the association ComplexTypes:
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L463
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L482
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L495
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L517

Since changing the XSD might result in validation problems in existing mappings, changing the XmlExporter seems a better approach.

Note that the '<cache/>' element is not yet generated by the XmlExporter, but according to the XML Schema, it should precede the '<cascade/>' element.
 2014-01-05 15:34:59 +01:00
Johannes Schmitt
e879626d73 Merge branch 'master' of github.com:doctrine/doctrine2 into rsmBuilder 2014-01-04 17:57:39 +01:00
Johannes Schmitt
946419459c fixes bad merge 2014-01-04 17:54:46 +01:00
Johannes Schmitt
4f585a3d63 Merge branch 'master' of github.com:doctrine/doctrine2 into ValueObjects 
Conflicts:
	UPGRADE.md
	lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
 2014-01-04 17:52:32 +01:00
Benjamin Eberlei
69cad4079d Merge pull request #820 from apancutt/master 
Added support for field options to FieldBuilder
 2014-01-03 14:03:25 -08:00
Benjamin Eberlei
2a9351b8dc [DDC-2792] Fix fatals 2014-01-03 23:01:05 +01:00
Vyacheslav Ganzin
1edf6b65b1 joinColumn is not required in manyToMany 
annotation behavior copied
 2014-01-03 22:27:27 +01:00
Benjamin Eberlei
c8c7cf0528 Fix tests after merge of QueryBuilder#addCriteria changes. 2014-01-03 21:28:06 +01:00
Piotr Antosik
eb45690e10 Fix typos - QueryBuilder 2014-01-03 17:28:42 +01:00
Adam Pancutt
352f5394e5 Removed FieldBuilder::unsigned() method as it is only supported by MySQL 2014-01-03 09:48:38 +00:00
Benjamin Eberlei
9a3cf77919 [DDC-2128] Fix PR according to comments. 2014-01-03 00:15:14 +01:00
catalin
93c018668d checking preg result. Should I raise an error 
throw new ORMException("Error regular expression: " . $filter);
 2014-01-03 00:15:14 +01:00
catalin
0d8f572661 added space after type cast (I could not find any rule in psr1/2 standard, but I modified in PhpStorm) 2014-01-03 00:15:14 +01:00