1
0
mirror of synced 2025-01-10 02:57:10 +03:00
Commit Graph

725 Commits

Author SHA1 Message Date
Cédric Chandon
9ba31a394a [DBAL-878] Wrong mapping type
the type should be the mapping type, and not the name of the type. This
does the difference for simple_array, as the result should be
simple_array and not simplearray
2014-04-25 01:59:15 +02:00
Marco Pivetta
a87d3e080e Minor CS fixes on top of #973 2014-04-14 01:21:23 +02:00
Adrian Olek
eccd8f85bc cs fixes 2014-04-14 01:21:23 +02:00
Adrian Olek
32ed32cf56 Added index flags test 2014-04-14 01:21:23 +02:00
Adrian Olek
b3a2988d2c CS fixes 2014-04-14 01:21:23 +02:00
Adrian Olek
cc2fb1a070 Added index flags support in annotation, xml & yaml mapping drivers. 2014-04-14 01:21:23 +02:00
Benjamin Eberlei
da24133306 Merge pull request #980 from adrianolek/convert-mapping-options
Added options attribute export to Annotation, Xml & Yaml exporters.
2014-04-13 23:38:30 +02:00
Marco Pivetta
e6bf096583 Prefixing alias counter with _ to fix DDC-3042 and prevent collisions 2014-04-04 03:05:48 +02:00
Adrian Olek
0caeb4edbf Initialize table options annotation, fixed condition in AnnotationDriver 2014-03-23 14:37:55 +01:00
Adrian Olek
553883bdd1 Added options attribute export to Annotation, Xml & Yaml
exporters.
2014-03-16 16:50:41 +01:00
Anton Stoeckl
83ef47c8d0 This fixes ticket DDC-3028
Enables columnPrefix to be "false" so no prefix is added.
Changed the structure a bit (to if/else) to be more readable with the additional condition.
2014-03-14 12:34:22 +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
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
Benjamin Morel
08f6291350 Cleaned up further unused imports. 2014-02-09 23:45:22 +00:00
Thomas Lallement
2a77a739dc Fix CS 2014-02-09 16:37:32 +01:00
Jan Kramer
43e37d4f2f Throw exception on embeddables in embeddables. 2014-02-09 10:09:28 +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
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
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
Adam Pancutt
352f5394e5 Removed FieldBuilder::unsigned() method as it is only supported by MySQL 2014-01-03 09:48:38 +00:00
Benjamin Eberlei
22d4d2e812 Merge branch 'DDC-2700' 2014-01-02 23:50:21 +01:00
Benjamin Eberlei
53ed898684 [DDC-2700] Add test and fix CS. 2014-01-02 23:50:15 +01:00
Benjamin Eberlei
2feffe164a Merge branch 'DDC-2732' 2014-01-02 23:33:56 +01:00
Steve Müller
337857dc8a add general IDENTITY generator type support for sequence emulating platforms 2013-12-29 05:55:16 +01:00
Benjamin Eberlei
f0546455d5 Remove left over ElementCollection code. 2013-12-20 15:01:10 +01:00
fabios
4e0e1b8061 CS/Typo Fixes 2013-12-16 15:55:54 -05:00
fabios
0a66a2bc09 CS/Doc Fixes 2013-12-16 11:05:05 -05:00
fabios
fb98277783 Fix docs 2013-12-16 11:05:05 -05:00
Fabio B. Silva
61bff7d5f6 Fix CS and update docs 2013-12-16 11:05:04 -05:00
Fabio B. Silva
1438a59c00 Fix persister query cache invalidation 2013-12-16 11:05:04 -05:00
Fabio B. Silva
3140593e9b Second level cache 2013-12-16 11:05:04 -05:00
Jan Kramer
fbb7b5ad8e Fix XmlDriver to accept embeddables 2013-12-07 16:40:54 +01:00
Jan Kramer
928c32d616 Update XML schema to reflect addition of embeddables 2013-12-07 16:38:32 +01:00
Johannes M. Schmitt
e5cab1db2d adds embedded classes to cache 2013-11-28 17:32:47 +01:00
fabios
e69cd37226 Event listener to programmatically attach entity listeners. 2013-11-18 15:03:00 -05:00
Johannes M. Schmitt
2a73a6f1f7 some cs fixes 2013-11-13 00:05:55 +01:00
Johannes M. Schmitt
fb3a06b9e7 adds support for XML/Yaml drivers 2013-11-13 00:03:21 +01:00
Johannes M. Schmitt
17e0a7b2f8 makes column prefix configurable 2013-11-02 14:07:14 +01:00
Johannes M. Schmitt
2b2f4894cb fixes declaring class 2013-11-02 13:55:19 +01:00
Johannes M. Schmitt
5586ddd6b7 removes restrictions on constructors of embedded objects 2013-11-02 13:31:44 +01:00
Johannes M. Schmitt
ece62d6ad7 adds support & tests for embeddables in inheritance schemes 2013-11-02 13:23:56 +01:00
Johannes M. Schmitt
97836ef8c6 some consistency fixes 2013-11-01 22:37:59 +01:00