RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 14:56:01 +03:00
Code Issues Projects Releases Wiki Activity
6,951 Commits 5 Branches 0 Tags 32 MiB
151192ae37
Commit Graph

2274 Commits

Author SHA1 Message Date
Guilherme Blanco
6949a95782 Merge pull request #505 from BenMorel/fix-errors 
Fix errors in JoinClassPathExpression and SqlWalker
 2012-11-05 16:12:31 -08:00
Fabio B. Silva
2f7e970c5f Fix DDC-2121 2012-11-05 21:53:07 -02:00
Benjamin Morel
88b29a4e59 Fixed errors: 
- Typo in variable name in JoinClassPathExpression;
 - Undefined class AST\ArithmeticPrimary (x2);
 - QueryException::invalidPathExpression() expects a PathExpression, not a string.
 2012-11-05 14:45:57 -08:00
nemekzg
9705ee89d9 Proposed fix for DDC-1241 2012-11-05 19:55:54 +01:00
Sebastian Bauer
a27be2fab6 added unsigned mapping to SchemaTool options 2012-11-05 19:49:16 +01:00
Gordon Stratton
9e916a2893 Fix for invalid 'double-ON' SQL generation with entity inheritance type JOINED. 
In SqlWalker::walkJoin(), SqlWalker::walkRangeVariableDeclaration() can be
called which may produce an 'ON' clause if the entity inheritance type is
JOINED. As walkJoin() may then produce another ON clause, this results in
invalid SQL (e.g. '... ON foo = bar ON (baz = quux) ...' when the inheritance
type is JOINED.

This adds a test and a fix for the problem, by checking for an inheritance type
of JOINED in walkJoin() and using AND instead of ON in the appropriate place.

It seems like this part of the code is begging to be refactored. This is my
first foray into Doctrine internals and can't see a way to do this without
stomping all over the rest of the code, but this section seems ripe for cleanup
by somebody who is familiar.
 2012-11-05 01:19:25 -08:00
Jeremy Marc
26dd533662 Compare to null instead of using isset 2012-11-04 19:04:13 -08:00
Jeremy Marc
84477440b6 Allow 0 id for Entity 
When using a 0 id, it's throwing InvalidArgumentException (Binding entities to query parameters only allowed for entities that have an identifier.)
 2012-11-04 17:41:08 -08:00
Nick Masters
e402a0c078 Spaces around ! sign 2012-11-04 15:22:32 +00:00
Nick Masters
3a8ea7260c Merge remote-tracking branch 'origin/master' into codegenerationfixes 2012-11-04 15:14:54 +00:00
Christophe Coevoet
1d3fe87215 Removed an unused private method in the SchemaValidator 2012-11-03 16:37:34 +01:00
Christophe Coevoet
5a6c398ea0 Fixed coding standards in the Tools namespace 2012-11-03 16:37:31 +01:00
TR
73e6164096 Update lib/Doctrine/ORM/Persisters/BasicEntityPersister.php 
coding standards change
 2012-11-03 09:47:08 +00:00
Guilherme Blanco
7d7287a1ba Merge pull request #434 from bamarni/filter-objects 
allowed to pass filter objects to the configurator
 2012-11-02 17:52:23 -07:00
Guilherme Blanco
ec1950d3ca Merge pull request #448 from stefanklug/master-parserFix 
Fixed Parser problem for SELECT (((3))) as ....
 2012-11-02 17:46:43 -07:00
Guilherme Blanco
515847bece Merge pull request #498 from lanthaler/improve-generated-entity-doc 
Improve DocBlock annotations of generated entities
 2012-11-02 17:27:11 -07:00
Guilherme Blanco
409516e86c Merge pull request #499 from md2perpe/master 
Speling: "invidiual" -> "individual"
 2012-11-02 11:13:19 -07:00
Per Persson
b5ac85d19a Update lib/Doctrine/ORM/Persisters/BasicEntityPersister.php 
Speling
 2012-11-02 18:37:46 +01:00
Markus Lanthaler
1b7ca67fdb Improve DocBlock annotations of generated entities 
Currently, the DocBlock annotations for member variables contain the variable name as description which is redundant and should be removed. Furthermore the class is annotated with the FQN instead of just the name. This makes automatically generated documentation quite ugly.
 2012-11-02 17:15:44 +01:00
Vaughn Clayton
ae30ce4596 [DDC-2113] Surround WHERE clause with parens if using SQLFilter 2012-11-02 08:48:57 -04:00
TR
185a0fb19c refactoring getIndividualValue for valid key value 
refactoring getIndividualValue
 2012-11-02 00:33:55 +00:00
TR
a65996f74c notice is thrown up if no identifier values found 
wrapping the setting of value with an array_key_exists to prevent a notice from being thrown
 2012-11-01 23:59:57 +00:00
Nick Masters
0a2ba38e58 Add new line to end of file 2012-10-30 22:42:01 +00:00
Nick Masters
0f92944edd Do not add trailing whitespace to blank lines 2012-10-30 22:22:04 +00:00
Martin Hasoň
7f33143502 Added NOT LIKE expression 2012-10-25 12:58:19 +02:00
Michal Piotrowski
a55b46b4bf remove unused classes 2012-10-23 18:19:28 +02:00
Guilherme Blanco
9d0b254407 Merge pull request #481 from beejeebus/master 
check for false as a return value from get_parent_class(), not null
 2012-10-21 20:54:22 -07:00
Guilherme Blanco
38d8c7f0d9 Merge pull request #467 from docteurklein/fix-bool-type-binding 
add bool detection when inferring type
 2012-10-21 18:39:29 -07:00
Guilherme Blanco
a16a935bff Merge pull request #472 from twinh/master 
Fixed empty namespace in generated code when repository class do not have namespace
 2012-10-21 18:38:53 -07:00
Guilherme Blanco
cd7ef6e7a7 Merge pull request #484 from jappie/master 
Prevented "Undefined index" notice when updating
 2012-10-21 18:35:38 -07:00
Guilherme Blanco
814f2f9e03 Merge pull request #487 from FabioBatSilva/DDC-2069 
Fix DDC-2069
 2012-10-20 20:00:54 -07:00
Fabio B. Silva
fb467a1196 Fix DDC-2079 2012-10-20 15:37:13 -03:00
Fabio B. Silva
86fddfed9a Fix DDC-2069 2012-10-20 00:28:38 -03:00
Jasper N. Brouwer
0cfc37d757 Prevented "Undefined index" notice when updating 
While executing updates on an entity scheduled for update without
a change-set, an "Undefined index" notice is raised.
 2012-10-17 21:50:09 +02:00
justin.randell
ca82a4720b check for false as a return value from get_parent_class(), not null 2012-10-16 15:04:25 +11:00
Benjamin Eberlei
deb6327b56 [DDC-2067] Refactor and fix bug in boolean evaluation inside XML Driver. 2012-10-12 21:47:09 +02:00
jakoch
d4a6c488ca fixed use statements 2012-10-12 13:53:20 +02:00
jakoch
ec5ad7136f fix typo 2012-10-12 13:37:17 +02:00
Oleksandr Kovalov
90bbb35655 Fixed bug with comment option not being added to column. 2012-10-11 15:57:51 +00:00
twinh
8cc24f4cf2 removed blanks 2012-10-11 06:04:03 -07:00
twinh
66efd65e64 fixed empty namespace in generated code when repository class do not have namespace 2012-10-11 06:01:55 -07:00
Klein Florian
7f8af83b5b add bool detection when inferring type 2012-10-10 11:20:41 +02:00
Ethan
c604adc804 Use protected so generator can be extended 
This is definitely something I'd like to be able to extend, and I imagine others might too.
 2012-10-09 08:00:51 -03:00
Stefan Klug
bf54c22cd9 removed unneded variable 2012-10-08 14:01:04 +02:00
Stefan Klug
1e1f34f9cb cleanup ScalarExpression 
_isFunction doesn't exclude subselects anymore
 2012-10-08 13:59:54 +02:00
Stefan Klug
6ccf7a7ac7 fixed Parser which incorrectly treated ((( as function 2012-10-08 13:57:34 +02:00
yohang
adc3d21385 Fixed typo on ConcatFunction 2012-10-08 12:44:36 +02:00
Benjamin Eberlei
235ad8e553 [DDC-2052] Add SqlWalker::setQueryComponent() to allow modification of the query component in a custom output walker 2012-10-06 11:16:16 +02:00
Benjamin Eberlei
a5e043e6e6 Merge pull request #444 from goetas/xmlfix 
Fixed some typo error in XML Exporter
 2012-10-05 14:16:59 -07:00
Benjamin Eberlei
f7220ae416 Merge pull request #455 from radmar/master 
Fixed unique-constraint name in XML Exporter
 2012-10-05 11:23:55 -07:00
Benjamin Eberlei
44c0ca4d3c [DDC-2059] Fix column and foreign key interfering with each other during reverse engineering. 2012-10-05 20:03:51 +02:00
Benjamin Eberlei
a0440b63bb Merge pull request #462 from doctrine/DDC-2055 
[DDC-2055] Generate SELECT clause from ResultSetMappingBuilder
 2012-10-05 09:46:37 -07:00
Benjamin Eberlei
0c8be37ca9 Merge pull request #458 from barelon/master 
Use cascade=all if all cascade options set
 2012-10-05 09:45:44 -07:00
Benjamin Eberlei
13762f20c9 Merge pull request #422 from FabioBatSilva/DDC-1574 
DDC-1574 - "new" operator
 2012-10-05 07:31:18 -07:00
Benjamin Eberlei
a47359e3f5 [DDC-2055] Fix CS 2012-10-04 20:18:10 +02:00
Benjamin Eberlei
91caff1d89 Merge pull request #459 from FabioBatSilva/DDC-2012 
Fix DDC-2012
 2012-10-03 03:46:04 -07:00
Benjamin Eberlei
913377e31b [DDC-2055] Add support to generate entity result parts of the SELECT clause from a ResultSetMappingBuilder instance. Add support for column incrementing. 2012-10-03 12:35:14 +02:00
Fran Moreno
45eef4a03c [SchemaValidator] Fix typo 2012-10-03 10:51:14 +03:00
barelon
919cf8558b Remove trailing whitespace 2012-10-02 00:16:29 +03:00
barelon
3b27216c51 add empty lines around if block 2012-10-02 00:14:24 +03:00
Fabio B. Silva
4510f5a5b8 Fix DDC-2012 2012-09-30 15:40:19 -03:00
barelon
cd37ec47d5 Set 'cascade' => 'all' if all cascade options set 2012-09-30 01:16:21 +03:00
barelon
c97eff94f5 Output cascade={"all"} if all cascade options set 2012-09-30 01:12:06 +03:00
Fabio B. Silva
dd984c7319 remove extra line 2012-09-29 16:19:03 -03:00
Fabio B. Silva
5f89fa4190 fix CS 2012-09-29 16:19:03 -03:00
Fabio B. Silva
7c754e495e support namespace alias 2012-09-29 16:19:03 -03:00
Fabio B. Silva
1bd6e841bf Fix some CS 2012-09-29 16:19:02 -03:00
Fabio B. Silva
de93983dff assume entity namespace when not given 2012-09-29 16:19:02 -03:00
Fabio B. Silva
3aa8d3fdac test constructor exceptions 2012-09-29 16:19:01 -03:00
Fabio B. Silva
91efe10855 fix some cs on ObjectHydrator 2012-09-29 16:19:01 -03:00
Fabio B. Silva
4dca27962e support multiple operators 2012-09-29 16:19:01 -03:00
Fabio B. Silva
f0403a5394 test literal values 2012-09-29 16:19:00 -03:00
Fabio B. Silva
e5e45a3a5c test sql generation 2012-09-29 16:18:59 -03:00
Fabio B. Silva
af2f556fd3 small refactory 2012-09-29 16:18:59 -03:00
Fabio B. Silva
b19e4a6440 support arithmetic expression and aggregate functions 2012-09-29 16:18:58 -03:00
Fabio B. Silva
88f04b5ebd parse nested new operators 2012-09-29 16:18:58 -03:00
Fabio B. Silva
2b403b7dad basic support refactory 2012-09-29 16:18:58 -03:00
Fabio B. Silva
b29d47a682 cache new object mappings 2012-09-29 16:18:58 -03:00
Fabio B. Silva
0fbb78e61a basic support, need some code refactory and improvements 2012-09-29 16:18:57 -03:00
Fabio B. Silva
ed89695a8c collect new object parameters 2012-09-29 16:18:57 -03:00
Fabio B. Silva
0e60c50c5e small code refactoring 2012-09-29 16:18:56 -03:00
Fabio B. Silva
0c1a8cd43f sql generation 2012-09-29 16:18:56 -03:00
Fabio B. Silva
ee7b5da64a start work 2012-09-29 16:18:56 -03:00
Marcin Radziwoński
380f4fbac7 Fixed unique-constraint name in XML Exporter 2012-09-26 14:27:16 +02:00
Konstantin Kuklin
34d8843fd6 improve phpdoc 2012-09-21 03:20:06 +04:00
Benjamin Eberlei
a9517b1b17 Merge pull request #436 from Powerhamster/comment-fixes 
Comment fixes
 2012-09-17 03:45:34 -07:00
Benjamin Eberlei
a256c43871 Merge pull request #442 from FabioBatSilva/fix-overrides-annot 
Remove unused code
 2012-09-17 03:33:19 -07:00
Asmir Mustafic
bc277c6e28 spaces 2012-09-13 11:04:23 +02:00
Asmir Mustafic
f86dcfc288 typo fix 2012-09-13 09:40:14 +02:00
Cas
de5b20d0bf Update lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php 
Allow 'nullable' attribute to be exported for fields, something which already worked in YamlExport. This addition saved me a lot of time during development, not having to manually re-factor after each export.

Don't know why this was missing, maybe it's me who is missing something, so let me know ;)
 2012-09-13 03:43:27 +03:00
Fabio B. Silva
8193397d4f remove duplicate code 2012-09-12 21:31:02 -03:00
Stefano Rodriguez
bb8dd6cb11 Fixes PersistentCollection::matching() when collection is not initialized and there are NEW entities in the collection 2012-09-07 10:46:34 +02:00
Thomas Rothe
7acdcd6952 added missing use statement 2012-09-06 21:03:40 +02:00
Thomas Rothe
7beffb5a5f Several fixes for comments 
updated @param and @throws annotations
 2012-09-06 21:03:26 +02:00
Benjamin Eberlei
2c99f97c8b [DDC-2003] Remove unused variable 2012-09-05 19:28:32 +02:00
Bilal Amarni
a9b4debe37 allowed to pass filter objects to the configurator 2012-09-03 10:52:46 +02:00
Josiah Truasheim
959c4f026f Refactored the SqlValueVisitor to move all type processing to the entity persister. 2012-08-31 20:58:16 +07:00
Josiah Truasheim
a6b6b25267 Removed the closure keyword as it isn't supported in PHP 5.3 2012-08-31 18:16:02 +07:00
Josiah Truasheim
c7f5d9d77d Fixed DDC-2003 using closures to reference the functionality of the calling entity persister from the SQL value visitor. 2012-08-31 18:12:44 +07:00
Benjamin Eberlei
bc2476f342 [DDC-1918] Fix weird results at the end of paginator when using fetch joins 2012-08-29 15:16:07 +02:00
Benjamin Eberlei
9c682efb2f Merge pull request #431 from pitiflautico/patch-1 
[ORM] Fix double semicolon
 2012-08-29 05:33:12 -07:00
Benjamin Eberlei
267daa5fc1 Merge pull request #428 from chEbba/query-builder-common-criteria 
Add QueryBuilder::addCriteria() for Criteria - QueryBuilder bridge
 2012-08-29 05:06:50 -07:00
Kirill chEbba Chebunin
ac98f15cfa Fix ORMInvalidArgumentException factory methods with return instead of throw 2012-08-29 14:02:51 +02:00
Kirill chEbba Chebunin
e68807ad4f Change version for QueryExpressionVisitor 2012-08-29 16:00:02 +04:00
Daniel Perez Pinazo
5b8ead9db8 [ORM] Fix double semicolon 2012-08-29 13:40:36 +03:00
Kirill chEbba Chebunin
1c2f2b5c13 Store QueryExpressionVisitor parameters as array 2012-08-20 20:28:22 +04:00
Kirill chEbba Chebunin
433d208572 Remove extra space from QueryBuilder::addCriteria() 2012-08-20 20:27:55 +04:00
Kirill chEbba Chebunin
d3ab948d88 Overwrite query limits only if set in QueryBuilder::addCriteria() 2012-08-20 20:27:30 +04:00
Kirill chEbba Chebunin
148789600a Remove unnecessary else statements after if with return in QueryExpressionVisitor 2012-08-20 20:27:14 +04:00
Kirill chEbba Chebunin
c6b3899c2d Add QueryBuilder::addCriteria() for Criteria - QueryBuilder bridge 2012-08-20 20:27:03 +04:00
FabioBatSilva
641af15280 Fix DDC-1977 2012-08-15 22:57:21 +02:00
Alexander
185b4e0c41 Fix setCustomHydrationModes + added test 2012-08-14 22:43:32 +02:00
Martin Meredith
787a208708 Create the setCustomHydrationMode function 
This allows multiple hydrators to be set at once, and also allows for
the customHydrationMode options to be set via DoctrineORMModule
 2012-08-14 22:33:25 +02:00
Guilherme Blanco
f8a582d454 Merge pull request #391 from FabioBatSilva/ns-class 
Give FQCN to NamingStrategy#propertyToColumnName
 2012-08-12 15:50:20 -07:00
Jonathan Ingram
04de52d4c9 Remove unused use statement 2012-08-02 15:33:09 +10:00
Benjamin Eberlei
104a76a6b1 Update EntityRepository and PersistentCollection to new Criteria#expr() method instead of having to implement themselves. 2012-08-01 21:37:22 +02:00
Michael Moravec
79a04b295f [DDC-1961] Fixed parameter type support in Parameter 2012-07-31 21:01:21 +02:00
Benjamin Eberlei
00a5f18544 [DDC-1937] Fix bug with apc and annotation caching using a workaround. 2012-07-29 11:56:41 +02:00
Benjamin Eberlei
e8d3fc73ff Merge branch 'DDC-1964' 2012-07-29 11:25:54 +02:00
Benjamin Eberlei
7c1235dedb [DDC-1964] Fix issue with refresh and and object hydrator not setting field to null explicitly to override possible previous values. 2012-07-29 11:25:45 +02:00
Benjamin Eberlei
bcbef5670c Merge branch 'DDC-1939' 2012-07-29 09:27:20 +02:00
Christophe Coevoet
cebb820030 Added the new DBAL 2.3 types in the EntityGenerator typehint map 2012-07-27 10:34:59 +02:00
Guilherme Blanco
04e6cc78cd Fixed is_subclass_of comparing an interface which brought our requirement to 5.3.9. Changed to reflection approach which still keep us at the same dependency as before. 2012-07-26 15:50:51 -04:00
Guilherme Blanco
1eaa822d2a Merge branch 'master' of github.com:doctrine/doctrine2 2012-07-25 01:24:33 -04:00
Guilherme Blanco
9dd3b66fe6 Fixed DefaultRepositoryClassName which should follow the Persistence interface, not ORM class. 2012-07-25 01:23:52 -04:00
Fabio B. Silva
50dac4096a give FQCN to NamingStrategy#propertyToColumnName 2012-07-24 14:34:27 +02:00
Marco Pivetta
aa0cb0b6d7 DDC-1939 - Removing references to non-existing AssociationMapping class 2012-07-24 11:37:57 +02:00
Guilherme Blanco
619d29adb2 Merge pull request #400 from stof/command_help 
Changed commands to use command.name in the help
 2012-07-22 22:04:15 -07:00
Guilherme Blanco
98c4833afc Merge pull request #404 from Ocramius/DDC-1933 
DDC-1933 - Fixing cloning of QueryBuilder and adding related tests
 2012-07-22 22:01:35 -07:00
Guilherme Blanco
e5979b5ef2 Moved implementation from EntityRepository to EntityManager. This decouples ER implementation from EM, as it should be. 2012-07-23 00:52:41 -04:00
Marco Pivetta
fb3c6f0e8f DDC-1933 - Fixing cloning of QueryBuilder and adding related tests 2012-07-21 20:34:20 +02:00
Christophe Coevoet
a723b73929 Changed commands to use command.name in the help 2012-07-17 00:55:09 +02:00
Benjamin Eberlei
34ac207b3c Bump Version to 2.4.0-DEV 2012-07-16 15:25:20 +02:00
Benjamin Eberlei
a0ba420969 Bump dev version to 2.3.0 2012-07-16 15:23:33 +02:00
Benjamin Eberlei
816f709950 Release 2.3.0-BETA1 2012-07-16 15:23:33 +02:00
Benjamin Eberlei
e0455b5550 Merge pull request #397 from Ocramius/cleanup/removing-deprecated-metadata-drivers 
Cleanup/removing deprecated metadata drivers
 2012-07-12 00:29:41 -07:00
Adel
51cd553de8 Fix phpdocs 2012-07-11 22:44:07 +00:00
Marco Pivetta
75276e453e Restoring class names extending the Doctrine\Common implementation for BC compatibility 2012-07-10 13:57:33 +02:00
Marco Pivetta
01f058953b Removing DriverChain and using Doctrine\Common implementation instead 2012-07-10 02:47:08 +02:00
Marco Pivetta
e2c1d7c38a Removing deprecated StaticPHPDriver and PHPDriver 
modifying tests so that the new implementation in Doctrine\Common is referenced
 2012-07-10 02:31:30 +02:00
Benjamin Eberlei
b2385e0afa [DDC-1637] Implementation of Criteria Collections API for 
PersistentCollection (OneToMany only) and EntityRepository.
 2012-07-09 09:59:48 +02:00
Benjamin Eberlei
fe292cc503 Merge pull request #392 from widop/patch-1 
Invalid paginator query cloning
 2012-07-08 09:34:09 -07:00
Marco Pivetta
346e34adf6 Reverting to default annotation driver with - delayed to 3.0 2012-07-08 17:33:50 +02:00
Marco Pivetta
245d906ebf Adding parameter to allow switching annotation reader implementation 2012-07-08 17:17:32 +02:00
Marco Pivetta
fc00d5f39f Updating upgrade docs and fixes suggested by @beberlei 2012-07-08 16:32:27 +02:00
Marco Pivetta
86dbddd596 Updating to reflect latest Doctrine Common changes 
Also, changing logic so that the SimpleAnnotationReader is no more the
default one. An additional parameter for the method will allow using it.

The CS fixes that were additionally implemented (along with other minor changes
that do not affect BC compatibility are caused by a CS sniff via IDE.
 2012-07-08 16:30:35 +02:00
Benjamin Eberlei
18d4a2f970 [DDC-1775] Fix NotifyPropertyChanged Listener being attached in addIdentityMap(), which is too late for certain use-cases in the persist lifecycle. 2012-07-07 17:47:29 +02:00
Benjamin Eberlei
ff2c5f85c3 [DDC-1846] Fix EntityRepository#find() with pessimistic locking. 2012-07-07 16:49:26 +02:00
Eric GELOEN
8c24e528ad Clone directly the ArrayCollection instead of looping 2012-07-07 11:38:53 +02:00
Christophe Coevoet
8d0f49f227 Updated the classmetadata factory for Common 2.3 
This adds the new method introduced in doctrine/common#162
 2012-07-06 22:18:06 +02:00