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

8460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Stoeckl
871dc5d186 Test are for fix of ticket DDC-3028 
Added 3 tests that check regression for:
- columnPrefix is empty
- columnPrefix is a string
- columnPrefix is false

Added some small entity / embeddable classes to support the test cases.
 2014-03-14 12:32:49 +01:00
Anton Stoeckl
cd2043915c columnPrefix must support string and boolean, so changing to mixed 2014-03-14 12:29:01 +01:00
Anton Stöckl
fa79de6ea4 Enable empty prefixes for inlined embeddable 
This fixes http://www.doctrine-project.org/jira/browse/DDC-2987

This makes it possible to map a field from an embeddable to a database field with the same name, without any prefix added.

Example:
- an embeddable object "Id" with a property "id"
- per default this would map inline to id_id
- supplying null or '' as columnPrefix does not work due to the ! empty() check
- with my little change, if columnPrefix : false is supplied in the mapping config this will now map to a db column "id"

To build Ids as ValueObjects is a very common approach in DDD, so ihmo this is a must have.
 2014-03-13 16:47:22 +01:00
Marco Pivetta
b30b1a5999 Merge pull request #977 from mvrhov/patch-2 
Fix wrong annotation
 2014-03-11 14:52:49 +01:00
Miha Vrhovnik
d888d7d1c0 Fix wrong annotation 
Without above fix I'm getting 
"[Semantical Error] The annotation "@array" in method Doctrine\ORM\Mapping\ClassMetadataInfo::mapEmbedded() was never imported. Did you maybe forget to add a "use" statement for this annotation?"
 2014-03-11 14:44:42 +01:00
Marco Pivetta
02daf0049a Merge branch 'docs/DDC-3020' 2014-03-11 11:30:18 +01:00
Marco Pivetta
fea200043e Adding note about DDC-3020 - external XML entities may or may not work 2014-03-11 11:30:08 +01:00
Marco Pivetta
87505c8716 Merge pull request #975 from tkleinhakisa/doc-automatic-discriminator-map 
Added info about automatic discriminator map
 2014-03-11 10:08:58 +01:00
Klein Thomas
832127a0d6 Added info about automatic discriminator map 
see https://github.com/doctrine/doctrine2/blob/master/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php#L257
 2014-03-11 09:54:46 +01:00
Guilherme Blanco
f197a9c9f1 Merge pull request #974 from FabioBatSilva/resolve-association-entry 
[SLC] Resolve association cache entry
 2014-03-06 22:38:26 -05:00
Fabio B. Silva
e9ec0a24da [SLC] resolve association cache entry 2014-03-06 20:44:59 -05:00
Fabio B. Silva
ecf242f6d4 Merge pull request #971 from FabioBatSilva/slc-query-assoc-proxy 
[SLC] Fix query association proxy
 2014-03-06 15:43:58 -05:00
Marco Pivetta
8d4821b4dc Merge pull request #972 from hallabro/patch-1 
Capitalize @GeneratedValue (annotations-reference.rst)
 2014-03-05 11:03:30 +01:00
Marco Pivetta
7843eed8bc Merge pull request #969 from aitboudad/patch-2 
[Doc] added note about Criteria limits on PersistentCollection
 2014-03-05 10:59:10 +01:00
Robin Hallabro
a395921fdc Capitalize @GeneratedValue (annotations-reference.rst) 2014-03-05 10:57:31 +01:00
Fabio B. Silva
cbdd8bc041 [SLC] Fix query association proxy 2014-03-05 04:10:07 -05:00
Abdellatif AitBoudad
5f429a5418 [Doc] added note Criteria limits. 2014-03-04 21:36:07 +00:00
Guilherme Blanco
15432fc55f Merge pull request #967 from FabioBatSilva/slc-query-builder 
[SLC] Add query builder options
 2014-03-03 21:10:48 -05:00
fabios
6e64cc101a [SLC] Add query builder options 2014-03-03 15:28:35 -05:00
Benjamin Eberlei
63d849b6f0 Merge pull request #966 from FabioBatSilva/simplify-build 
Simplify build matrix
 2014-03-02 12:36:50 +01:00
Fabio B. Silva
a91e05db9e Simplify build matrix 2014-03-01 17:13:28 -05:00
Benjamin Eberlei
a522aa0a81 Merge pull request #965 from FabioBatSilva/slc-criteria 
[SLC] Add support for criteria
 2014-03-01 12:47:57 +01:00
Benjamin Eberlei
f0a6eb8723 Merge pull request #964 from FabioBatSilva/DDC-2943 
[SLC][DDC-2943] Disable slc for pagination queries
 2014-03-01 12:46:52 +01:00
Fabio B. Silva
8c2aef3f14 [DDC-2943] Disable slc for pagination queries 2014-03-01 01:15:09 -05:00
Fabio B. Silva
f4c63f8238 [SLC] Support criteria 2014-03-01 00:59:34 -05:00
Benjamin Eberlei
f5897d4b0b Merge branch 'master' of github.com:doctrine/doctrine2 2014-02-21 16:14:57 +01:00
Benjamin Eberlei
51e5db86b7 Add SECURITY.md and a chapter on security assumptions in Doctrine ORM. 2014-02-21 16:12:32 +01:00
Marco Pivetta
dfe7a68053 Removing notice about public properties support (included since 2.4) 
see doctrine/doctrine2#406
 2014-02-19 22:02:07 +01:00
Marco Pivetta
5a2497d482 Merge pull request #935 from da-eto-ya/remove_public_validation 
Remove incorrect (outdated) validation for public fields in SchemaValidator
 2014-02-19 21:21:59 +01:00
Marco Pivetta
0797feeb0f Travis must use --prefer-source because of Github API limitations 2014-02-18 10:28:13 +01:00
Guilherme Blanco
0dbd742588 Merge pull request #886 from Strate/bugfix/join-with-condition-placement-fix 
[DDC-1256] Fix applying ON/WITH conditions to first join in Class Table Inheritance
 2014-02-17 12:12:05 -05:00
Marco Pivetta
4382304e77 Merge pull request #953 from goetas/patch-1 
Update doc with latest news about extra lazy assoc
 2014-02-12 23:56:00 +01:00
Asmir Mustafic
e27d963784 Update extra-lazy-associations.rst 2014-02-12 23:42:52 +01:00
Asmir Mustafic
1f0d4197a9 Update doc with latest news about extra lazy assoc 2014-02-12 23:42:13 +01:00
Fabio B. Silva
a3b4104612 Merge pull request #950 from goetas/patch-1 
[SLC] Cache empty collections
 2014-02-12 04:26:27 -05:00
Asmir Mustafic
94896ce552 Typo fix on many-to-many assocaition cascade test 2014-02-12 08:18:34 +01:00
Asmir Mustafic
8cdbcf1263 Merge remote-tracking branch 'origin/master' into patch-1 2014-02-12 05:15:00 -02:00
Marco Pivetta
9b0d7dde91 Merge pull request #952 from simshaun/patch-1 
Add DB-level onDelete CASCADE example
 2014-02-11 23:24:38 +01:00
Shaun
57ac3bd4be Add DB-level onDelete CASCADE example 
This adds `onDelete: CASCADE` to the `address` 1-1 relationship just to show how you would map a db-level cascade.
 2014-02-11 17:23:19 -05:00
Asmir Mustafic
4a6d6e34f8 Test empty collections second level cache 2014-02-11 17:39:16 +01:00
Asmir Mustafic
a5fbb20fbb Can cache many to many empty relations 2014-02-11 15:08:49 +01:00
Asmir Mustafic
1c94c16234 Can cache empty collections 
I should be able to cache an "empty" collection.

I have a some objects, where 90% of these have on-to-many relations with zero associated elements.
This causes doctrine to run a query each time, instead of cache it as empty relation.
 2014-02-11 14:59:31 +01:00
Marco Pivetta
e8f51acdb2 Merge pull request #947 from BenMorel/unused-imports 
Cleaned up further unused imports.
 2014-02-10 05:48:56 +01:00
Strate
324f200f1b Merge branch 'master' into bugfix/join-with-condition-placement-fix 2014-02-10 08:22:11 +04:00
Benjamin Morel
08f6291350 Cleaned up further unused imports. 2014-02-09 23:45:22 +00:00
Marco Pivetta
c4b1d4fa28 Merge pull request #946 from BenMorel/unused-imports 
Cleaned up unused imports
 2014-02-09 23:33:26 +01:00
Benjamin Morel
412e4ab9da Cleaned up unused imports 2014-02-09 22:12:51 +00:00
Steve Müller
6cd0861fa3 Merge pull request #945 from raziel057/patch-1 
Fix CS
 2014-02-09 16:54:22 +01:00
Thomas Lallement
2a77a739dc Fix CS 2014-02-09 16:37:32 +01:00
Benjamin Eberlei
4c4e4f6d3d Merge pull request #939 from doctrine/DDC-1985 
[DDC-2939] Order Preservation
 2014-02-09 15:43:57 +01:00