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,432 Commits 5 Branches 0 Tags 32 MiB
738cc250f8
Commit Graph

2694 Commits

Author SHA1 Message Date
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
catalin
2326033e79 added preg_quote to $filter input 2014-01-03 00:15:13 +01:00
catalin
57e7559c1b - Applied Phpstorm PSR format 
- Changed RegExp format
 2014-01-03 00:15:13 +01:00
Catalinux
6963bf6028 Now MetaDataFilter takess also regexp. For example whern you want to 
extract metadata if you would filter like this: --filter="Article"
would extract also for "ArticleItems" (article_items table). Now you
can use --filter="Article$" if you want only that table (articl)
 2014-01-03 00:15:13 +01:00
Benjamin Eberlei
8118dddc6a Merge pull request #674 from TorbenBr/master 
Shortcut for force
 2014-01-02 15:02:46 -08: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
Benjamin Eberlei
96ec3c1613 Merge pull request #830 from sandermarechal/sort-alias 
[DDC-2764] Prefix criteria orderBy with rootAlias
 2014-01-02 14:15:01 -08:00
Benjamin Eberlei
41581847b2 Merge pull request #833 from ronanguilloux/patch-console-entity-generator 
Generate-Entities-Console-Command: Adding an 'avoid backup' flag
 2014-01-02 14:13:27 -08:00
Benjamin Eberlei
17809abd29 Merge pull request #837 from mnapoli/DDC2775 
DDC-2775 Tests and fix
 2014-01-02 14:07:14 -08:00
Benjamin Eberlei
05576d3e1c Merge pull request #844 from terite/orm-validate-skip 
Teach orm:validate-schema to --skip-mapping and --skip-sync
 2014-01-02 14:00:22 -08:00
Benjamin Eberlei
ea84cfbdd1 Merge pull request #845 from flack/avoid-update-on-delete 
Don't compute changeset for entities that are going to be deleted
 2014-01-02 13:59:25 -08:00
Benjamin Eberlei
3a8aaea14a Merge pull request #794 from stefankleff/patch-1 
Multiple invokation of listeners on PreFlush event
 2014-01-02 13:16:21 -08:00
yktd26
c9e06a6854 Format code 2013-12-31 12:25:14 +01:00
yktd26
bee74f898d autoGenerate arg from bool to int 
For using all four modes of proxies generation, change the 4th arg of
ProxyFactory's constructor to integer
 2013-12-31 11:58:36 +01:00
Guilherme Blanco
a7b9140d2f Merge pull request #890 from deeky666/DBAL-563 
[DBAL-563] Add general IDENTITY generator type support for sequence emulating platforms
 2013-12-30 21:34:20 -08:00
Sergey Polischook
07f67c5d1a Allow to not generate extra use 
For case when we not generate annotation (by default at doctrine orm:generate-entities) allow to not generate extra use for it - 
```php
use Doctrine\ORM\Mapping as ORM;
```
For example if generate entities for my project that use only dbal in pord but use orm for generate entities in dev mode.
 2013-12-30 04:43:35 +02:00
Steve Müller
337857dc8a add general IDENTITY generator type support for sequence emulating platforms 2013-12-29 05:55:16 +01:00
Matthieu Napoli
c9791fe97f Inlined the model for the DCC2775 test case inside the test class 2013-12-23 09:55:10 +01:00
Strate
c6810861ca Fix applying ON/WITH conditions to first join in Class Table Inheritance 2013-12-22 21:02:14 +04:00
fabios
cf4c805427 Fix cache misses using one-to-one inverse side 2013-12-20 15:37:07 -05:00
fabios
22e3a76327 Fix non initialized association proxy 2013-12-20 10:39:03 -05:00
Benjamin Eberlei
f0546455d5 Remove left over ElementCollection code. 2013-12-20 15:01:10 +01:00
Michaël Perrin
1032a16db2 Simpler way to handle Collection parameters in DQL queries (refs #DDC-2319) 2013-12-17 11:37:17 +01:00
Benjamin Eberlei
ad9366a1fc Merge pull request #871 from elmariachi111/patch-1 
XCache cannot be flushed on the CLI -> for pretty much the same reason as APC
 2013-12-16 15:47:09 -08: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
71903c28a8 Region cache clear commands 2013-12-16 11:05:05 -05:00
fabios
fb98277783 Fix docs 2013-12-16 11:05:05 -05:00
fabios
d135e402bb handle update/delete queries 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
fabios
1bfa8f0fc3 Extract cache config 2013-12-16 11:05:04 -05:00
Fabio B. Silva
3140593e9b Second level cache 2013-12-16 11:05:04 -05:00
Benjamin Eberlei
86ae6f18ab Merge branch 'DDC-2645' 2013-12-15 23:31:49 +01:00
Pouyan Savoli
a5b7069fd7 [DDC-2645] Apply patch to fix issue 2013-12-15 23:31:35 +01:00
Aaron Muylaert
3cc630798b Fix DDC-1787. 
Credit goes to Jack van Galen for fixing this issue.
Fix for JoinedSubclassPersister, multiple inserts with versioning throws
an optimistic locking exception.
 2013-12-14 13:50:46 +01:00
Stefan A
eded05d415 XCache cannot be cleared on CLI (like APC) 2013-12-10 19:51:41 +01:00
Stefan A
88a56ee8f8 XCache cannot be cleared on CLI (like APC) 2013-12-10 19:51:02 +01:00
Stefan A
53fbb0b2d1 XCache cannot be cleared on CLI (like APC) 2013-12-10 19:48:30 +01:00
Luís Otávio Cobucci Oblonczyk
6d58824ac5 Use docblox from EntityManagerInterface 2013-12-10 12:09:36 -02:00
Luís Otávio Cobucci Oblonczyk
67135e5d6f Fixing FQCN on docblox 2013-12-10 12:08:53 -02:00
Luís Otávio Cobucci Oblonczyk
877ba9bf17 Documenting interface methods (based on entity manager) 2013-12-10 11:18:27 -02: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
Guilherme Blanco
0e3c57dbd3 Merge pull request #849 from bsahlhof/master 
Error with Same Field, Multiple Values, Criteria and QueryBuilder
 2013-11-25 21:20:14 -08:00
Johannes M. Schmitt
8ae48ad9db lifts an unnecessary restriction on ResultSetMappingBuilder 2013-11-23 19:47:56 +01:00
fabios
9e3ad91225 Version 2.5.0-DEV 2013-11-19 11:50:43 -05:00
Brad Sahlhoff
96fb0d7e14 Changed logic to allow joining games, and becoming friends 
Added Spacing
 2013-11-19 11:09:23 -05:00
fabios
e69cd37226 Event listener to programmatically attach entity listeners. 2013-11-18 15:03:00 -05:00
Brad Sahlhoff
c2997b3961 Add ability to test same parameter name for multiple values. 2013-11-18 10:36:46 -05:00
flack
ffd858b238 Merge remote-tracking branch 'upstream/master' into avoid-update-on-delete 2013-11-17 11:36:06 +01:00
flack
9807718100 Also skip entities scheduled for deletion when committing multiple entities 2013-11-17 11:31:21 +01:00
Fabio B. Silva
3529cd4282 Merge pull request #797 from peterkokot/patch-1 
CS fixes
 2013-11-16 10:52:09 -08: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
David Stensland
e6be52af3a Teach orm:validate-schema to --skip-mapping and --skip-sync 
Use --skip-mapping to not check if the current mapping informaiton
is valid or not.

Use --skip-sync to not check if the database schema is in line with
the current schema mapping.
 2013-11-11 18:12:28 -05:00
flack
9016a5a854 don't compute changeset for entities that are going to be deleted 2013-11-12 00:11:50 +01:00
Matthieu Napoli
e018bb83f0 [DDC-2775] Bugfix 2013-11-04 12:42:23 +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
0cd6061fc2 fixes a bad merge 2013-11-02 13:35:41 +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
d4e6618b28 Merge remote-tracking branch 'schmittjoh/ValueObjects' 2013-11-02 11:20:44 +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
c67ac8a11b adds support for selecting based on embedded fields 2013-11-01 20:38:19 +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
Sander Marechal
35a62e9a05 Add rootAlias to Criteria where clauses 2013-11-01 13:43:03 +01:00
Sander Marechal
202039e853 Set rootAlias outside loop 2013-11-01 13:19:33 +01:00
Ronan Guilloux
48d078a856 no-backup instead of nobackup 2013-10-31 12:25:43 +01:00
Ronan Guilloux
5c01e8e99e Generate-Entities-Console-Command: Adding an 'avoid creating backup files' flag 2013-10-31 12:00:32 +01:00
Sander Marechal
b6f8d53ff1 [DDC-2764] Prefix criteria orderBy with rootAlias 2013-10-29 11:11:46 +01:00
Benjamin Eberlei
9a3298347c [DDC-2759] Fix regression in ArrayHydrator introduced in DDC-1884 at SHA c7b4c9bf0f 2013-10-26 11:16:07 +02:00
Brikou CARRE
84b980227f s/PostgreSQLPlatform/PostgreSqlPlatform/ 2013-10-21 09:44:48 +02:00
Marco Pivetta
a96fe8770c Merge pull request #815 from nicolas-bastien/patch-2 
Remove unused use statement
 2013-10-18 03:46:09 -07: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
Vincent BOURDEIX
5506d7adce Fixes a Fatal Error when using a subexpression in parenthesis 
When some dql contains a subselect with expression in parenthesis, the
expression of the $simpleSelectExpression parameter given to
walkSimpleSelectExpression is an instance of AST\ParenthesisExpression.
Before this commit, this case defaulted to
$this->walkEntityIdentificationVariable($expr) where $expr is supposed
to be a string. A fatal error was then yielded.
 2013-10-14 15:04:52 +02:00
Guilherme Blanco
bb63058410 Merge pull request #780 from terite/DDC-2655 
[DDC-2655] Don't let getOneOrNullResult throw NoResultException
 2013-10-11 13:43:27 -07:00