RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 22:56:04 +03:00
Code Issues Projects Releases Wiki Activity
8,083 Commits 5 Branches 0 Tags 32 MiB
0326731348
Commit Graph

2514 Commits

Author SHA1 Message Date
Benjamin Eberlei
eb1a162cbc Fix regression in DDC-2430. 2013-05-10 23:31:27 +02:00
Benjamin Eberlei
bf9673203c Merge pull request #639 from goetas/indexby-metadata 
Added abillity to use metacolumn as indexBy
 2013-05-09 23:53:26 -07:00
Marco Pivetta
22c9f6ebec applying required fixes for DDC-2432 2013-05-09 21:14:58 +02: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
6d5afb18bc [DDC-2430] Prevent Criteria queries using the ID of an assocation on PersistentCollections, as the in-memory ArrayCollection does not work with this kind of query. Attention this is a BC-BREAK, that is necessary to fix potentially very hard to debug bugs. Therefore it is not merged back into 2.3 2013-05-09 13:24:36 +02:00
Benjamin Eberlei
7220c3c125 [DDC-2387] Fix DatabaseDriver not working with combinations of composite/association keys. 2013-05-09 12:10:37 +02:00
Benjamin Eberlei
86277def7e Merge branch 'DDC-2437' 2013-05-09 11:03:21 +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
acbafd081b Add documentation to EntityManager about instantiation, decoration over inheritance, and some generic introduction. 2013-05-09 10:23:12 +02:00
Vladislav Vlastovskiy
33888f1b08 Swapped places indexBy and condition in accordance with EBNF 2013-05-09 03:30:48 +04:00
Benjamin Eberlei
c8bcdb4b61 Merge pull request #524 from lstrojny/feature/entity-manager-decorator 
EntityManagerDecorator base class as an extension point for EntityManager
 2013-05-04 06:02:39 -07: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
5e19e1bed3 [DDC-2267] Allow EntityManager#flush($entity) to be called on entities scheduled for removal. 2013-05-04 13:38:30 +02: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
0864ab8ada [DDC-1998] Pass types to Connection#delete() to allow custom conversions to happen. 2013-05-01 20:30:45 +02:00
Benjamin Eberlei
131164b7f6 [DDC-1984] Throw exception if passing null into UnitOfWork#lock() - which can happen when EntityManager#find() tries to lock entity that was just deleted by another process. 2013-05-01 19:39:21 +02:00
Benjamin Eberlei
640a8e58c7 [DDC-2106] Fix entity as parameter value when its managed but not yet with identifier. 2013-05-01 18:46:41 +02:00
Benjamin Eberlei
6505c96ec4 Simplify condition of previous commit (5cdc73e) 2013-05-01 10:58:44 +02:00
Benjamin Eberlei
760aaa67c4 Merge pull request #655 from FabioBatSilva/DDC-2409 
[DDC-2409] Fix merge association STATE_NEW
 2013-05-01 01:49:25 -07: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
Fabio B. Silva
5cdc73e13b Fix DDC-2409 2013-04-28 16:54:44 -03:00
Fabio B. Silva
7c2da2d5b8 Fix DDC-2415 2013-04-26 16:11:04 -03:00
EuKov
99ec4dc72c Fixed typo in SQLFilter (use statement ClassMetadata) 2013-04-23 20:46:19 +03: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
Benjamin Eberlei
52b2e066c5 Merge pull request #611 from stefankleff/fix-eagerloading 
Fixed typo in hints. Caused slow loading of eager entities.
 2013-04-14 00:43:42 -07: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
Stefan Kleff
e561f47cb2 Added constant 2013-04-08 11:27:22 +02:00
Benjamin Eberlei
cef20890dc Merge pull request #616 from FabioBatSilva/DDC-2252 
[DDC-2252] Fix delete many-to-many composite key
 2013-04-06 10:37:16 -07:00
Benjamin Eberlei
fe238d03c8 Merge pull request #618 from FabioBatSilva/DDC-2188 
[DDC-2188] Fix arithmetic priority
 2013-04-06 07:56:36 -07:00
Pascal Borreli
30b050b44c Fixed typos 2013-04-06 14:31:27 +00:00
Benjamin Eberlei
64b2ecfefc [DDC-2224] Rewrite instanceof feature with parameter needle ClassMetadata breaks caching of queries. 2013-04-04 20:22:48 +02: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
denkiryokuhatsuden
3e8796f781 Add hidden field ordering for postgresql 
In postgresql environment, when some hidden fields are used in orderBy clause,
they're not property added because $rsm->scalarMappings don't have information about them.
 2013-04-02 18:54:55 +09:00
Asmir Mustafic
6fc18e330d indexby metadata column 2013-04-02 10:04:15 +02:00
Adam Prager
937ba6385e fixed code duplication issue 2013-03-31 00:47:24 +01:00
Adam Prager
9797177193 check if ReflectionClass::getTraits() method exists 2013-03-27 02:48:35 +01:00
Adam Prager
8898c91dfc only check for traits when class exists 2013-03-26 21:28:09 +01:00
Adam Prager
8e3e2e770a Revert "only use already existing reflections" 
This reverts commit bb5bdcf0f4.
 2013-03-26 21:17:59 +01:00
Adam Prager
bb5bdcf0f4 only use already existing reflections 2013-03-26 21:14:52 +01:00
Adam Prager
521276f1ed entity generator - ignore trait properties and methods 2013-03-26 20:52:57 +01:00
Marco Pivetta
7afe5af73a Fix for DDC-2359 2013-03-24 19:42:50 +01:00
Jan Hruban
3866472459 Import EntityManager in ConsoleRunner 2013-03-21 15:49:00 +01:00
Fabio B. Silva
39ea24675d Fix DDC-2090 2013-03-17 16:59:33 -03:00
Benjamin Eberlei
a7d764f6c0 Moved tools to Advanced topic, included simple setting up tools in Installation. Reworked CLI tool to print a template when no cli-config.php is defined. 2013-03-17 12:16:42 +01:00
Fabio B. Silva
685c96a1b9 Fix arithmetic priority 2013-03-16 14:33:19 -03:00
Fabio B. Silva
1effd38043 Fix DDC-2252 2013-03-16 01:15:54 -03:00
Benjamin Eberlei
559303430a [DDC-1666] Fix bug where orphan removal on one-to-one associations lead to unique constraint errors when replacing an entity with a new one. 2013-03-14 23:41:31 +01:00
Benjamin Eberlei
d0419782bd [DDC-2300] Fix version xml mapping and serialization of ClassMetadata. 2013-03-14 23:20:23 +01:00
Benjamin Eberlei
4982e2b6b0 Merge pull request #593 from norzechowicz/hydrator-fix 
Fix SimpleObjectHydrator behavior when column not exists in fieldMappings, relationMappings and metaMappings
 2013-03-14 14:58:52 -07:00
Benjamin Eberlei
eca468b9d1 [DDC-2340] Fix bug with dirty collection matching + ordering. 2013-03-12 22:49:30 +01:00
Rajesh Sharma
4841a068be [DDC-2304] accept more than 2 parameters in CONCAT function 
- Tested and parser validates at least 2 parameters given
- test added for CONCAT function and indentation fixed
- calling getConcatExpression using call_user_func_array as number of arguments is not known removing dependency to patch DBAL
- maintaining backward compatibility
 2013-03-12 19:59:45 +01:00
Benjamin Eberlei
fc86a31c10 Merge pull request #591 from Aitboudad/master 
Remove dead code
 2013-03-12 11:52:23 -07:00
Benjamin Eberlei
ba4705176e Merge pull request #601 from jankramer/add-contains-comparison 
Add 'contains' comparison
 2013-03-12 11:38:18 -07:00
Jean-Guilhem Rouel
8b8d1a5aaa Don't add empty expression to another one 2013-03-12 19:17:11 +01:00
Benjamin Eberlei
3ba0562006 Merge branch 'GH-572' 2013-03-12 19:04:27 +01:00
Norbert Orzechowicz
6a69b4700c [DDC-2282] Fix pagination problem with SQL Server. 
ORDER BY removed from all count queries when on SQL Server
Fixed SQLServer ORDER BY problem in paginator CountOutputWalker
Added test to check query with ORDER BY and SQLServerPlatform
 2013-03-12 19:03:27 +01:00
Stefan Kleff
d937d1fc82 Fixed typo in hints. Caused slow loading of eager entities. 2013-03-12 16:17:14 +01:00
Pascal Borreli
87e06993d6 Fixed typo 2013-03-11 00:31:50 +00:00
Pascal Borreli
a2cd0f5804 Fixed typos 2013-03-11 00:08:58 +00:00
Jan Kramer
760623346c Added 'contains' comparison 2013-03-07 13:32:56 +01:00
Lars Strojny
acc8b61cd1 Adding EntityManagerDecorator base class as an extension point for EntityManager 2013-03-06 23:30:47 +01:00
MDrollette
1846f5845c alias the proxy class on import to avoid "already exists" error 2013-03-01 11:58:51 -06:00
Vladislav Veselinov
30fd22a260 Use inflector for add/remove methods 2013-02-28 21:05:41 +02:00
Norbert Orzechowicz
f9519479fc Fix SimpleObjectHydrator behavior when column not exists in fieldMappings, relationMappings and metaMappings 2013-02-28 10:10:28 +01:00
Guilherme Blanco
d5dd7d6f8a Merge pull request #589 from Ocramius/hotfix/DDC-2230 
Hotfix for DDC-2230
 2013-02-25 21:59:04 -08:00
Guilherme Blanco
32c220497c Merge pull request #585 from Ocramius/hotfix/DDC-2306 
Hotfix/DDC-2306
 2013-02-25 21:55:44 -08:00
Abdellatif Ait boudad
5206566707 Remove dead code 2013-02-26 00:02:34 +00:00
Marco Pivetta
350fa4f15b Applying fix for failing test for DDC-2230 2013-02-23 01:45:40 +01:00
Christophe Coevoet
16b407f535 Fixed the license and the added version 2013-02-22 17:57:50 +01:00
Joshua Johnson
b55d78e119 Fix EntityManager doc 2013-02-21 17:27:55 -05:00
Benjamin Eberlei
8fce78fbfb [DDC-2310] Fix regression introduced in SQL Server lock handling. 2013-02-21 19:02:21 +01:00
Marco Pivetta
a5ece5063a Fixing DDC-2306 2013-02-21 02:24:48 +01:00
Benjamin Eberlei
805bb5ff9f Remove mentions of PEAR installation method, remove code. 2013-02-15 01:04:29 +01:00
Marco Pivetta
a58d4ae462 Cleaning up logic of the proxy factory by moving closure generation to own private methods 2013-02-14 10:52:13 +01:00
Marco Pivetta
271f5cf033 Adding fix and tests for DDC-1734 2013-02-14 09:57:12 +01:00
Marco Pivetta
8272ffd23f Proxy generation as of doctrine/common#168 - DCOM-96 2013-02-14 09:57:12 +01:00
Benjamin Eberlei
35fda90473 Merge pull request #570 from Ocramius/cleanup/submodules-removal 
Deprecation of PEAR/GIT/TAR autoloading
 2013-02-14 00:55:08 -08:00
Benjamin Eberlei
ce594fb152 [DDC-2256] Cleanup patch, move dependency on EntityManager out of ResultSetMapping and let AbstractQuery perform the translation. 2013-02-13 09:05:35 +01:00
Fabio B. Silva
719031f2ef Merge pull request #569 from Ocramius/hotfix/pre-flush-event-args-params 
Hotfix/pre flush event args params
 2013-02-12 15:39:40 -08:00
Benjamin Morel
cba1c8295c Fixed wrong return types in documentation. 2013-02-12 11:49:44 +00:00
Alexander
1a163cd48d [DDC-2019] Add support for expression in QueryBuilder#addOrderBy() 2013-02-09 22:40:34 +01:00
Alexander
9bf501dd25 Revert "allowed to pass filter objects to the configurator" 
This reverts commit a9b4debe37. See the
discussion on the original PR:

https://github.com/doctrine/doctrine2/pull/434

Conflicts:
	lib/Doctrine/ORM/Configuration.php
 2013-02-09 20:28:52 +01:00
Marco Pivetta
673323fc67 Adding warnings about deprecation of GIT, TAR and PEAR autoloading 2013-02-04 23:30:02 +01:00
Marco Pivetta
f281dbbf54 Fixing incorrect constructor params for PreFlushEventArgs 2013-02-04 20:46:51 +01:00
Marco Pivetta
3ebed101fd Strong typehinting to avoid incorrect constructor params 2013-02-04 20:45:58 +01:00
Guilherme Blanco
f0674ea034 Merge pull request #564 from BenMorel/f834c37f8a465ca3e23ee9ae62ef0bc4a525454c 
Fix a wrong return type
 2013-02-02 20:06:44 -08:00
Guilherme Blanco
114827a4b3 Merge pull request #565 from BenMorel/unusedvar 
Removed an unused local variable.
 2013-02-02 20:05:42 -08:00
Benjamin Morel
2bfbe03e37 Fixed return statements in SchemaTool. 2013-02-03 01:42:27 +00:00
Benjamin Morel
4b58c6fc41 Removed an unused local variable. 2013-02-03 01:05:43 +00:00
Benjamin Morel
f834c37f8a Fixed a wrong return type. 2013-02-03 00:48:05 +00:00
Benjamin Eberlei
71a68a5c6f Merge pull request #423 from FabioBatSilva/DDC-1955 
DDC-1955 - @EntityListeners
 2013-02-02 11:47:46 -08:00
Guilherme Blanco
dea37ed9e8 Merge pull request #554 from beregond/hydrator-fix 
Fixed ObjectHydrator when namespace alias is given.
 2013-02-02 11:18:00 -08:00
Jakub Vrana
819e5896bf Fix error in QueryBuilder example 2013-01-30 11:11:09 -08:00
Fabio B. Silva
7177306536 remove extra comma 2013-01-29 12:14:53 -02:00
Fabio B. Silva
ec2d5af2c7 added missing file 2013-01-29 12:14:53 -02:00
Fabio B. Silva
e6d9d1de47 support naming convention for listeners without mapping. 2013-01-29 12:14:53 -02:00
Fabio B. Silva
46fea51622 use '!==' instead of '!=' 2013-01-29 12:14:53 -02:00
Fabio B. Silva
e9c89cafb9 Fix DocBlock 2013-01-29 12:14:53 -02:00
Fabio B. Silva
6d7b3863b5 Use bitmask of subscribed event systems. 2013-01-29 12:14:53 -02:00
Fabio B. Silva
7b0f59ed7c split override test 2013-01-29 12:14:53 -02:00
Fabio B. Silva
0d0fc320b4 Fix DocBlock 2013-01-29 12:14:53 -02:00
Fabio B. Silva
0d0f91a807 move listeners invocation from ClassMetadataInfo to ListenerInvoker 2013-01-29 12:14:53 -02:00
Fabio B. Silva
c60e3e4ba4 remove @LifecycleCallback 2013-01-29 12:14:52 -02:00
Fabio B. Silva
ffc8d032c7 Fix typo 2013-01-29 12:14:52 -02:00
Fabio B. Silva
195b639344 change xml driver to use <lifecycle-callback\> 2013-01-29 12:14:52 -02:00
Fabio B. Silva
6b7e588da5 fix CS 2013-01-29 12:14:52 -02:00
Fabio B. Silva
4be25cb330 small refactoring 2013-01-29 12:14:52 -02:00
Fabio B. Silva
8495eca1a4 rename test 2013-01-29 12:14:52 -02:00
Fabio B. Silva
a01d6583d3 implements a entity listener resolver 2013-01-29 12:14:52 -02:00
Fabio B. Silva
27745bb87b Fix some CS 2013-01-29 12:14:52 -02:00
Fabio B. Silva
256cecbefa evaluate as lifecycle callback if the listener class is not given. 2013-01-29 12:14:52 -02:00
Fabio B. Silva
fd6f592430 support @LifecycleCallback in @EntityListeners 2013-01-29 12:14:52 -02:00
Fabio B. Silva
f0b04375de yaml driver 2013-01-29 12:14:52 -02:00
Fabio B. Silva
917aa70c97 test invalid class/method 2013-01-29 12:14:52 -02:00
Fabio B. Silva
7e54ae3702 xml driver 2013-01-29 12:14:52 -02:00
Fabio B. Silva
c6adcda567 give event to lifecycle callbacks 2013-01-29 12:14:52 -02:00
Fabio B. Silva
315f7ba43b call listeners in UoW 2013-01-29 12:14:51 -02:00
Fabio B. Silva
3c223a59c4 move call listeners tests to AbstractMappingDriverTest 2013-01-29 12:14:51 -02:00
Fabio B. Silva
0f081d7c45 support short class name 2013-01-29 12:14:51 -02:00
Fabio B. Silva
368cf73f89 entity listeners mapping 2013-01-29 12:14:51 -02:00
aleks
dc190a297d Fix typo 2013-01-27 11:09:26 +02:00
aleks
5e6bc0847f Added support for order by scalar 2013-01-26 21:31:45 +02:00
Szczepan Cieślik
92ada246b5 [DDC-2256] Code improvements. 2013-01-26 09:09:21 +01:00
Szczepan Cieślik
935594578a [DDC-2256] Code refactorization. 2013-01-25 13:15:14 +01:00
Szczepan Cieślik
d7f82221d1 [DDC-2256] Moved aliases translation to ResultSetMapping, fixed tests. 2013-01-25 12:06:13 +01:00
Szczepan Cieślik
23e0bb7345 Fixed ObjectHydrator when namespace alias is given. 2013-01-24 15:50:05 +01:00
Benjamin Eberlei
eedf85cbdb [DDC-2243] Fix bug where a bigint identifier would be casted to an integer, causing inconsistency with the string handling. 2013-01-20 20:31:22 +01:00
Benjamin Eberlei
5298c03fce [DDC-2246] Fix bug with UnitOfWork#getEntityState() and entities with foreign identifier. 2013-01-20 20:11:08 +01:00
Fabio B. Silva
93fba518a6 keep braces 2013-01-19 13:38:44 -02:00
Fabio B. Silva
4dcd5a1286 Fix DDC-2234 2013-01-18 23:18:50 -02:00
Fabio B. Silva
6074755b91 Fix DDC-1376 2013-01-13 22:39:59 -02:00
Benjamin Eberlei
6f572a61c7 Merge branch 'DDC-2231' 2013-01-12 10:29:20 +01:00
Guilherme Blanco
71efe2109a Merge pull request #548 from nemekzg/DDC-2203 
Fix for DDC-2203
 2013-01-10 11:13:18 -08:00
nemekzg
cfd1b07ffe Fix for DDC-2203 2013-01-10 16:52:19 +01:00
Stefan Kleff
dc925cc9c5 fixed indentation 
Restored old way of injection to just inject it during a refresh
Added injection for initialized proxies
 2013-01-10 15:19:44 +01:00
Stefan Kleff
151192ae37 The EntityManager was not injected in uninitialized proxys which are ObjectManagerAware. 
I ran into that problem while I had two objects in the identitymap while hydrating a collection: one was new a "real" entity and the other one was an uninitialized proxy. For "real" entities the em is injected in line 2427, for new entities it is injected in 2436->2364, but for proxies this is missing. According to the comment "inject ObjectManager into just loaded proxies." the code in line 2427 should do this, but in fact it is just used if it is a "real" entity or an already initialized proxy. Moving the injection to outside of the condition in line 2411 (if the entity is an unitialized proxy) solves this.
 2013-01-10 14:54:52 +01:00
Francesc Rosàs
1e669132c2 No huge if clause 2013-01-06 19:05:46 +01:00
Francesc Rosàs
9322ca7052 Ensure onFlush and postFlush events are always raised 2013-01-06 19:05:46 +01:00
Benjamin Eberlei
ce290bc99b DDC-1698 - Allow autoload registration from a Configuration instance 2013-01-06 11:07:19 +01:00
Benjamin Eberlei
7dfe0cae08 DDC-1698 - Prepend autoloader to stack and fix CS 2013-01-06 11:03:58 +01:00
Benjamin Eberlei
4210969087 DDC-2192 - Prevent using append flag in case of where and having to avoid user confusion, because this is not allowed. 2013-01-06 10:33:57 +01:00
Benjamin Eberlei
90b6d5e293 Merge branch 'master' of github.com:doctrine/doctrine2 2012-12-24 10:40:52 +01:00
Benjamin Eberlei
e2c1ff1a48 [DDC-2175] Fix bug in JoinedSubclassPersister 2012-12-24 10:39:23 +01:00
Benjamin Eberlei
904effcf4e Merge pull request #538 from FabioBatSilva/identity-composite-key 
IDENTITY() Support composite primary key
 2012-12-24 01:19:05 -08:00
Klein Florian
8443eee628 use base events 2012-12-24 10:15:25 +01:00
Benjamin Eberlei
e319e34783 Merge pull request #528 from BenMorel/master 
Documentation fixes
 2012-12-23 12:22:09 -08:00