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,923 Commits 5 Branches 0 Tags 32 MiB
1208cc836a
Commit Graph

688 Commits

Author SHA1 Message Date
Menno Holtkamp
8d0a5958eb Code-style improvement 2014-03-31 11:02:36 +02:00
Menno Holtkamp
59842e9bc6 Code-style improvement 
Also to trigger Travis CI
 2014-03-31 11:00:50 +02:00
Thomas Lomas
7d9630786b Update EntityGenerator comment 
fieldVisibility was referred to as a boolean, where it is actually a string.
 2014-03-29 01:49:12 +00:00
Menno Holtkamp
798075931a Exporter support for association fetch modes 2014-03-26 01:00:17 +01:00
Benjamin Eberlei
927d69b61a Merge pull request #957 from thealjey/master 
makes doctrine less dependent upon the symfony yaml component
 2014-03-23 15:41:27 +01:00
Benjamin Eberlei
8addb5ffa8 Merge pull request #960 from drealecs/fixes-EntityManagerInterface 
allow passing EntityManagerInterface when creating a HelperSet
 2014-03-23 15:36:38 +01:00
Menno Holtkamp
ef4e73f987 Use boolean values for 'unique' attribute 
As defined in: https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L294

Same as 'nullable' attribute. 

It was being exported as a "1" for TRUE and "0" for false
 2014-03-20 11:08:29 +01:00
Adrian Olek
49587776fa Renamed _exportOptions method 2014-03-16 17:31:15 +01:00
Adrian Olek
e403bf207c cs fix 2014-03-16 16:56:46 +01:00
Adrian Olek
553883bdd1 Added options attribute export to Annotation, Xml & Yaml 
exporters.
 2014-03-16 16:50:41 +01:00
Fabio B. Silva
8c2aef3f14 [DDC-2943] Disable slc for pagination queries 2014-03-01 01:15:09 -05:00
Alexandru Patranescu
1fe6dbc1f2 allow passing EntityManagerInterface when creating a HelperSet 2014-02-23 20:01:14 +02:00
Eugene Kuzmenko
c06201303d makes doctrine less dependent upon the symfony yamp component 2014-02-20 09:28:44 +00:00
Marco Pivetta
5a2497d482 Merge pull request #935 from da-eto-ya/remove_public_validation 
Remove incorrect (outdated) validation for public fields in SchemaValidator
 2014-02-19 21:21:59 +01:00
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
Ilya Pleshakov
1f3290faae Remove incorrect (outdated) validation for public fields in SchemaValidator 2014-02-06 13:02:41 +04: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
Benjamin Eberlei
95af021ed9 Merge pull request #737 from Koc/fix-schema-validator-master 
Skip not mapped public properties in SchemaValidator
 2013-08-10 07:27:45 -07:00
Benjamin Eberlei
610e18949b Merge pull request #744 from jbruni/patch-1 
Corrected PHP type for "decimal" mapping type
 2013-08-10 07:23:50 -07:00
Konstantin.Myakshin
3c1fd9a3a9 Skip not mapped public properties in SchemaValidator 2013-08-07 01:18:15 +03:00
Guilherme Blanco
354d7050dc Merge pull request #720 from bakura10/fix-paginator 
Allow to have non-distinct queries
 2013-08-05 20:59:12 -07:00
J Bruni
3c613b9c02 Corrected PHP type for "decimal" mapping type 
"Basic Mapping" documentation says:
"decimal: Type that maps a SQL DECIMAL to a PHP string."
 2013-08-03 05:44:15 -03:00
Marco Pivetta
4bc8f7be16 Merge pull request #728 from armetiz/patch-1 
Color message like the update tools
 2013-07-22 08:19:50 -07:00
Thomas Tourlourat
4882ff1ef5 Add info tag around ATTENTION 2013-07-22 17:11:53 +02:00
Nicolas Nutten
eba933bb47 To avoid "SpacingAfterParams" error with PHPCS Symfony2 coding standard 
Hello,
I added two blank lines in comments two avoid the following error with PHPCS Symfony2 coding standard :
Error Code: SpacingAfterParams
Error Description: Last parameter comment requires a blank new line after it.
 2013-07-22 10:56:18 +02:00
Thomas Tourlourat
0c3581a1f8 Color message like the update tools 2013-07-19 11:33:35 +02:00
Guilherme Blanco
fbbb161987 Merge pull request #719 from tristanlins/fix/entity-generator-extensibility 
Access properties via static:: instead of self::.
 2013-07-17 17:18:01 -07:00
Michaël Gallego
3f112db725 Allow to have non-distinct queries 2013-07-09 17:31:30 +02:00
Guilherme Blanco
78fc129614 Merge pull request #632 from Padam87/entgentrait 
entity generator - ignore trait properties and methods
 2013-07-07 12:37:55 -07:00
Tristan Lins
641774630b Access properties via static:: instead of self::. 
The properties of EntityGenerator are now protected instead of private.
But this does not make sense until they are accessed with static::.
Otherwise the templates cannot be overwritten within a sub class.
 2013-07-05 13:40:57 +02:00
Dave Hulbert
5e700db6d3 Fix grammar in CreateCommand 2013-07-02 16:29:36 +01:00
Dave Hulbert
c57f2c39f6 Fix grammar in DropCommand 2013-07-02 16:28:58 +01:00
Guilherme Blanco
20e5d98b7b Merge pull request #640 from denkiryokuhatsuden/patch-1 
[Paginator]Add hidden field ordering for postgresql
 2013-06-24 19:23:36 -07:00
Adam Prager
73e2aa54ef moved php version check 2013-06-14 10:07:05 +02:00
Guilherme Blanco
0d834d0bd4 DDC-2489 Added missing semicolon when dump-sql on schema update. 2013-06-12 00:31:25 -04:00
Grégoire Paris
a986fe013e Explicitely state what the problem is 
People like me think the problem is that there is no association
mapping, when the problem in fact could be that there also is a field
mapping on the property.
This message makes it clearer why we are getting an error message.
 2013-06-03 12:07:08 +02:00
Torben
997f22fbb9 add shortcut for force 2013-05-20 10:06:11 +02:00
Gusakov Nikita
6bb3184dbf fix bc 2013-05-18 02:40:18 +04:00
Gusakov Nikita
4c1869dca0 ready 2013-05-18 02:09:07 +04:00
Benjamin Eberlei
b53f4fd4cc [DDC-2280] length attribute in <id> was not converted. 2013-05-09 18:15:41 +02:00
Benjamin Eberlei
1a0adecf29 [DDC-2335] Add note about filtering schema by regexp expression to relevant commands help output. 2013-05-09 16:24:19 +02:00
Benjamin Eberlei
e3b8ce7737 [DDC-2423] Fixed bug with EntityGenerator not generating fetch="" attribute in association annotations. 2013-05-09 10:55:12 +02:00
Benjamin Eberlei
8e8560b276 Merge pull request #537 from Powerhamster/joined-composite-keys 
fixed problems with joined inheritance and composite keys
 2013-05-04 05:59:02 -07:00
Benjamin Eberlei
6d02c7e1a5 [DDC-2136] Fix exporting to YAML and XML with assocation keys. 2013-05-01 23:10:13 +02:00
Benjamin Eberlei
1f08acb576 [DBAL-483] Pass default values to DBAL mapping layer correctly to fix default comparision bug. 2013-05-01 10:42:28 +02:00
Benjamin Eberlei
92b41e017a [DDC-2407] Fix missing support for UUID and CUSTOM id generators in Exporter 2013-04-20 10:25:36 +02:00
Raymond Kolbe
4bafcc5b31 Fix Oracle subquery ordering 
See http://www.doctrine-project.org/jira/browse/DDC-1800 and http://www.doctrine-project.org/jira/browse/DDC-1958#comment-19969
 2013-04-09 17:30:54 -03:00
Raymond Kolbe
b8b7afe576 Fix Oracle subquery ordering lost bug 
See http://www.doctrine-project.org/jira/browse/DDC-1800 for a full description.
 2013-04-09 17:00:06 -03:00
Pascal Borreli
30b050b44c Fixed typos 2013-04-06 14:31:27 +00:00
Adam Prager
3b7b457d35 minor fixes 2013-04-04 20:07:21 +02:00
denkiryokuhatsuden
7af84e79e5 Fixed postgresql hidden scalar sort 2013-04-03 17:22:31 +09:00
denkiryokuhatsuden
786d904328 Revert "Add hidden field ordering for postgresql" 
This reverts commit 3e8796f781.
 2013-04-03 17:14:31 +09:00