RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-10 19:17:10 +03:00
Code Issues Projects Releases Wiki Activity
8,946 Commits 5 Branches 0 Tags 32 MiB
25849a3412
Commit Graph

744 Commits

Author SHA1 Message Date
Marco Pivetta
76e1a469ef Merge pull request #1027 from PowerKiKi/feature-partial-indexes 
Support for Partial Indexes for PostgreSql and Sqlite
 2014-11-05 13:19:29 +01:00
Marco Pivetta
6e79515a75 Merge pull request #1123 from stof/patch-1 
Fixed the structure of the reverse-engineered mapping
 2014-08-30 04:19:55 +02:00
Guilherme Blanco
4b504c9436 Merge pull request #1109 from doctrine/hotfix/DDC-3120-php-5.6-RC3-compat 
DDC-3120 - PHP 5.6-RC3 compatibility
 2014-08-27 12:27:05 -04:00
Christophe Coevoet
00eb0d3b67 Fixed the structure of the reverse-engineered mapping 2014-08-27 13:56:02 +02:00
Guilherme Blanco
400acad533 Merge pull request #1105 from deeky666/nested-embeddables 
Add support for nesting embeddables
 2014-08-21 16:33:44 -04:00
Marco Pivetta
361ec2a474 DDC-3120 - using Doctrine\Instantiator when building new instances 2014-08-14 15:51:48 +02:00
Saša Stamenković
133bd288bf Minor CS fix 2014-08-12 09:57:19 +02:00
Steve Müller
0768916a06 fix handling infinite nesting of embeddables 2014-08-12 07:56:39 +02:00
Steve Müller
bca9d31531 add support for nesting embeddables 2014-08-11 16:53:18 +02:00
Adrien Crivelli
1003466a5f Surround ! with spaces according to code style 2014-08-05 18:07:00 +09:00
Adrien Crivelli
27adf8d6e9 Refactor partial into options array 
This coherent with what is done for Table. All platform specific things
are grouped into an options array. Eventually flags should be migrated
into options as well.
 2014-07-22 10:32:31 +09:00
Adrien Crivelli
eeb7ff4a6d Support for Partial Indexes for PostgreSql and Sqlite 
Support for Partial Indexes was available in Doctrine 1 following
http://www.doctrine-project.org/jira/browse/DC-82. This commit
reintroduce support for Doctrine 2. We use the same syntax with an
optionnal "where" attribute for Index and UniqueConstraint.
 2014-07-22 10:32:30 +09:00
Rudolph Gottesheim
daa90bf32d Fix typo in exception message 2014-06-04 15:59:57 +02:00
Benjamin Eberlei
46ebb57b45 Fix wrong version 2014-06-03 21:41:26 +02:00
Benjamin Eberlei
e577e77867 Cleanup 93c276d 2014-06-03 17:05:02 +02:00
Marco Pivetta
72750b05e6 Using PHP_VERSION_ID instead of version_compare to see if we're using PHP 5.4+ 2014-05-31 13:37:39 +02:00
Renaud LITTOLFF
93c276d059 Fix the "Erroneous data format for unserializing" error message 2014-05-30 10:43:11 +02:00
Eduardo García Sanz
8a3def097f [DDC-3027] Avoid duplicated mapping using Embedded in MappedSuperclass 2014-04-30 11:46:54 +02:00
Marco Jantke
f065a5c8b9 fixed bug 2014-04-29 09:30:37 +02:00
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