RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-08 10:07:10 +03:00
Code Issues Projects Releases Wiki Activity
8,412 Commits 5 Branches 0 Tags 32 MiB
1c94c16234
Commit Graph

623 Commits

Author SHA1 Message Date
Benjamin Morel
08f6291350 Cleaned up further unused imports. 2014-02-09 23:45:22 +00:00
Benjamin Morel
412e4ab9da Cleaned up unused imports 2014-02-09 22:12:51 +00:00
Benjamin Eberlei
4c4e4f6d3d Merge pull request #939 from doctrine/DDC-1985 
[DDC-2939] Order Preservation
 2014-02-09 15:43:57 +01:00
Wouter J
d7b917aa49 Fixed InputOption modes 2014-02-09 15:10:00 +01:00
Benjamin Eberlei
d31f7ebf57 [DDC-1985] Fix ordering preservation in SQL limit subquery output walker. 2014-02-08 17:01:55 +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
Tim Lieberman
25d71462e3 Make SchemaTool and SchemaValidator use EntityManagerInterface instead of EntityManager 2014-02-01 05:11:20 +00:00
Tim Lieberman
bf9fbd896b Substitute EntityManagerInterface for EntityManager in Console EntityManagerHelper 2014-02-01 00:23:23 +00:00
Tim Lieberman
43d94e7b5e Console EntityManagerHelper now accepts EntityManagerInterface as constructor argument, instead of insisting on an EntityManager 2014-01-31 15:32:31 -08:00
Guilherme Blanco
b65d9e6c83 Merge pull request #896 from holtkamp/patch-2 
Ensure <cascade/> elements preceed <join-columns/>
 2014-01-05 11:32:31 -08:00
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
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
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
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
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
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
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
71903c28a8 Region cache clear commands 2013-12-16 11:05:05 -05: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
fabios
e69cd37226 Event listener to programmatically attach entity listeners. 2013-11-18 15:03:00 -05:00
Fabio B. Silva
3529cd4282 Merge pull request #797 from peterkokot/patch-1 
CS fixes
 2013-11-16 10:52:09 -08: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
Johannes M. Schmitt
0cd6061fc2 fixes a bad merge 2013-11-02 13:35:41 +01:00
Johannes M. Schmitt
d4e6618b28 Merge remote-tracking branch 'schmittjoh/ValueObjects' 2013-11-02 11:20:44 +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
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
Benjamin Eberlei
fc53bc8909 Fix some LGPL occurances to MIT 2013-10-02 12:07:37 +02:00
Guilherme Blanco
d8335eee7b Merge pull request #793 from flip111/patch-2 
Improved error messages in Paginator: LimitSubqueryOutputWalker
 2013-09-30 11:07:49 -07:00
Cas
1fda797c8f Appended newline to (newly) generated files for PSR2 compatibility 
Appended newline to (newly) generated files for PSR2 compatibility
Additionally, slightly improved styling of concatenating return value
 2013-09-28 17:47:35 +02:00
Kristian Mide
0326731348 Respect unsigned fields when tables get converted to entities. 
This is working on our mysql setup, however i have no idea of the consequences of this change when using other RDBMSes.
 2013-09-26 14:41:06 +02:00
Peter Kokot
dca09148ca CS fixes 2013-09-22 02:12:30 +02:00
flip111
a18aba1bb6 Improved error messages in Paginator: LimitSubqueryOutputWalker 
The already existing follow-up check throwing "Not all identifier properties can be found in the ResultSetMapping: %s" is a much more technical description.

If $sqlIdentifier is empty (count 0) it can be concluded that there are no mapped results. An alternative error message could thus be "The Paginator does not support queries without mapped results." (line 153).

Possibly '!=' on line 154 could be replaced by '>' because i think this is the only situation that can occur. But since i don't know this for sure, i left it like i found it.

Didn't use elseif in this commit as per Stof his suggestion.
 2013-09-17 21:01:09 +02:00
flip111
b803f06c8f Improved error messages in Paginator: LimitSubqueryOutputWalker 
The already existing follow-up check throwing "Not all identifier properties can be found in the ResultSetMapping: %s" is a much more technical description.

If $sqlIdentifier is empty (count 0) it can be concluded that there are no mapped results. An alternative error message could thus be "The Paginator does not support queries without mapped results." (line 153).

Possibly '!=' on line 154 could be replaced by '>' because i think this is the only situation that can occur. But since i don't know this for sure, i left it like i found it.
 2013-09-17 15:07:08 +02:00
Maks Feltrin
f98dfc4758 DO NOT OVERRIDE CUSTOM TREE WALKERS IN getIterator() 2013-08-29 08:36:39 +02:00
Attila Fulop
5669aaf4a3 Fix for entity generator discriminator column 2013-08-28 18:26:16 +03:00
Adam Prager
b041c22814 Entity generator - trait in parent class 2013-08-20 12:15:17 +02:00
Douglas Greenshields
494ab1fc2b corrected English grammar in docblocks 2013-08-13 20:45:04 +01:00
Roger Llopart Pla
1bc6140394 Added docblock. 2013-08-10 16:58:07 +02:00
Roger Llopart Pla
7f1becf283 Appending the Paginator tree walker hint, instead of removing all the other hints. 2013-08-10 16:58:07 +02:00