1
0
mirror of synced 2025-01-09 18:47:10 +03:00
Commit Graph

770 Commits

Author SHA1 Message Date
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
Johannes M. Schmitt
f86abd81dd fixes annotation context 2013-11-01 22:33:59 +01:00
Johannes M. Schmitt
20fb8270dc make use of NamingStrategy for columns of embedded fields 2013-11-01 21:44:57 +01:00
Johannes M. Schmitt
fd8b5bd045 removes outdated todos 2013-11-01 21:16:02 +01:00
Johannes M. Schmitt
38b041d909 Merge remote-tracking branch 'origin/ValueObjects'
Conflicts:
	lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
2013-11-01 20:17:43 +01:00
Brikou CARRE
84b980227f s/PostgreSQLPlatform/PostgreSqlPlatform/ 2013-10-21 09:44:48 +02:00
Adam Pancutt
553086ae3d Removed check for instantiated options array 2013-10-15 13:17:07 +01:00
Adam Pancutt
db5274113a Code style fix 2013-10-15 12:49:34 +01:00
Adam Pancutt
25342b706d Added support for field options to FieldBuilder 2013-10-15 12:37:06 +01:00
Eduardo
aabb34f853 Options not respected for ID Fields in XML Mapping Driver
Same bug of the YAML driver, see: http://www.doctrine-project.org/jira/browse/DDC-2661
2013-10-09 22:40:29 +02:00
Benjamin Eberlei
fc53bc8909 Fix some LGPL occurances to MIT 2013-10-02 12:07:37 +02:00
Alex Pogodin
a75d73b889 Identifier can be empty for MappedSuperclasses
When MappedSuperclass is inspected without identifier column been assigned, always return false. Solves "Undefined offset" notice.
2013-09-22 17:19:51 +03:00
Benjamin Eberlei
4a50493ab7 [DDC-2608][DDC-2662] Fix SequenceGenerator requiring "sequenceName" and now throw exception. Fix a bug in quoting the sequenceName. 2013-09-08 15:59:58 +02:00
Benjamin Eberlei
3719a6f2f2 [DDC-2661] Fix bug in YamlDriver not passing options from id to mapField() 2013-09-08 10:37:13 +02:00
Fabio B. Silva
a165f63c8c ANSI compliant quote strategy 2013-06-21 16:05:59 -04:00
Michaël Perrin
37d7df6ac4 Fix phpDoc syntax in ClassMetadataInfo.php 2013-06-14 11:00:17 +03:00
Guilherme Blanco
3d86c82a7f DDC-2476 Better approach for reverse engineer. Some refactoring done to driver. 2013-06-12 02:00:36 -04:00
Fabio B. Silva
710d0d1109 Fix DDC-1995 2013-06-07 17:24:05 -04:00
Benjamin Eberlei
20b5ab26e7 Merge pull request #669 from hason/many_to_many
Fixed generating column names for self referencing entity.
2013-05-25 22:16:48 -07:00
Fabio B. Silva
f92214997f [DDC-2435] Fix column name with numbers and non alphanumeric characters. 2013-05-17 13:02:46 -03:00
Fabio B. Silva
4d6cef1ff6 [DDC-2451] Fix entity listeners serialization 2013-05-17 11:42:11 -03:00
Martin Hasoň
bef5b585cb Fixed generating join column names for self referencing entity. 2013-05-17 16:28:45 +02:00
Benjamin Eberlei
7220c3c125 [DDC-2387] Fix DatabaseDriver not working with combinations of composite/association keys. 2013-05-09 12:10:37 +02:00
Benjamin Eberlei
6d02c7e1a5 [DDC-2136] Fix exporting to YAML and XML with assocation keys. 2013-05-01 23:10:13 +02:00
Fabio B. Silva
7c2da2d5b8 Fix DDC-2415 2013-04-26 16:11:04 -03:00
Pascal Borreli
30b050b44c Fixed typos 2013-04-06 14:31:27 +00:00
Benjamin Eberlei
9613f1d8cb [DDC-93] Rename ReflectionProxy to ReflectionEmbeddedProperty, Add DQL test with Object and Array Hydration. 2013-03-27 21:45:16 +01:00
Benjamin Eberlei
011776f02f [DDC-93] Add some TODOs in code. 2013-03-27 00:18:21 +01:00
Benjamin Eberlei
0204a8b69a [DDC-93] Implement first working version of value objects using a ReflectionProxy object, bypassing changes to UnitOfWork, Persisters and Hydrators. 2013-03-27 00:10:30 +01:00
Benjamin Eberlei
32988b3cdf [DDC-93] Parse @Embedded and @Embeddable during SchemaTool processing to make parsing work. 2013-03-26 21:45:15 +01:00
Marco Pivetta
7afe5af73a Fix for DDC-2359 2013-03-24 19:42:50 +01:00
Benjamin Eberlei
559303430a [DDC-1666] Fix bug where orphan removal on one-to-one associations lead to unique constraint errors when replacing an entity with a new one. 2013-03-14 23:41:31 +01:00
Benjamin Eberlei
d0419782bd [DDC-2300] Fix version xml mapping and serialization of ClassMetadata. 2013-03-14 23:20:23 +01:00
Pascal Borreli
87e06993d6 Fixed typo 2013-03-11 00:31:50 +00:00
Pascal Borreli
a2cd0f5804 Fixed typos 2013-03-11 00:08:58 +00:00
Marco Pivetta
8272ffd23f Proxy generation as of doctrine/common#168 - DCOM-96 2013-02-14 09:57:12 +01:00
Benjamin Morel
cba1c8295c Fixed wrong return types in documentation. 2013-02-12 11:49:44 +00:00
Fabio B. Silva
7177306536 remove extra comma 2013-01-29 12:14:53 -02:00
Fabio B. Silva
ec2d5af2c7 added missing file 2013-01-29 12:14:53 -02:00
Fabio B. Silva
e6d9d1de47 support naming convention for listeners without mapping. 2013-01-29 12:14:53 -02:00
Fabio B. Silva
e9c89cafb9 Fix DocBlock 2013-01-29 12:14:53 -02:00
Fabio B. Silva
6d7b3863b5 Use bitmask of subscribed event systems. 2013-01-29 12:14:53 -02:00
Fabio B. Silva
0d0fc320b4 Fix DocBlock 2013-01-29 12:14:53 -02:00
Fabio B. Silva
0d0f91a807 move listeners invocation from ClassMetadataInfo to ListenerInvoker 2013-01-29 12:14:53 -02:00
Fabio B. Silva
c60e3e4ba4 remove @LifecycleCallback 2013-01-29 12:14:52 -02:00
Fabio B. Silva
ffc8d032c7 Fix typo 2013-01-29 12:14:52 -02:00
Fabio B. Silva
195b639344 change xml driver to use <lifecycle-callback\> 2013-01-29 12:14:52 -02:00
Fabio B. Silva
6b7e588da5 fix CS 2013-01-29 12:14:52 -02:00
Fabio B. Silva
4be25cb330 small refactoring 2013-01-29 12:14:52 -02:00
Fabio B. Silva
8495eca1a4 rename test 2013-01-29 12:14:52 -02:00
Fabio B. Silva
a01d6583d3 implements a entity listener resolver 2013-01-29 12:14:52 -02:00
Fabio B. Silva
27745bb87b Fix some CS 2013-01-29 12:14:52 -02:00
Fabio B. Silva
256cecbefa evaluate as lifecycle callback if the listener class is not given. 2013-01-29 12:14:52 -02:00
Fabio B. Silva
fd6f592430 support @LifecycleCallback in @EntityListeners 2013-01-29 12:14:52 -02:00
Fabio B. Silva
f0b04375de yaml driver 2013-01-29 12:14:52 -02:00
Fabio B. Silva
917aa70c97 test invalid class/method 2013-01-29 12:14:52 -02:00