RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-15 07:36:03 +03:00
Code Issues Projects Releases Wiki Activity
6,393 Commits 5 Branches 0 Tags 32 MiB
e09a9c7deb
Commit Graph

1903 Commits

Author SHA1 Message Date
Andreas Hucks
3419c65efe fixed docblock 2012-02-14 19:08:44 +01:00
Andreas Hucks
2e81fbfd64 added type hint 2012-02-14 19:08:17 +01:00
Fabio B. Silva
da9b2e805e remove unused parameter 2012-02-13 23:43:19 -02:00
Fabio B. Silva
cdde6e8a5c fix required discriminator column name 2012-02-13 23:38:36 -02:00
Fabio B. Silva
5d01123413 Fix DDC-807, DDC-553 2012-02-13 23:22:49 -02:00
Fabio B. Silva
86054eb659 fix DDC-1642 2012-02-12 22:24:03 -02:00
Miha Vrhovnik
bea78f42e3 Proxy not initialized when parent has get<IDENTIFIER> function. Fixes DDC-1625 2012-01-30 11:44:08 +01:00
Benjamin Eberlei
3c4d2cd890 Merge pull request #253 from mrmkrs/protectedfields 
enable set visibilty of class fields in EntityGenerator
 2012-01-28 13:13:37 -08:00
Benjamin Eberlei
120bad8a2c Merge pull request #262 from wrightlabs/patch-1 
added optional Command array as parameter for run method
 2012-01-28 13:12:50 -08:00
Benjamin Eberlei
6b1ef08a46 Merge pull request #162 from ericclemmons/patch-1 
ProxyFactory creates proxy's parent structure if it doesn't exist
 2012-01-28 13:12:26 -08:00
Benjamin Eberlei
359a9c015b Merge pull request #196 from goetas/manyidx 
Added some improvments for generated XML
 2012-01-28 13:11:22 -08:00
Benjamin Eberlei
2ce705ceb3 Merge pull request #272 from jsor/table_options 
Implement custom options on table level and complete column options implementation
 2012-01-28 12:56:19 -08:00
Benjamin Eberlei
16b22f0f31 Merge pull request #266 from FabioBatSilva/DDC-1412 
[DriverChain] Fix DDC-1412 Default Driver
 2012-01-28 12:54:47 -08:00
Benjamin Eberlei
3407620bf8 [DDC-1526] Collections are not marked as initialized when they are fetch joined but dont contain any results. This only occurs when using LEFT JOINs on the assocations and causes another query to be fired when the empty collection is accessed again. 2012-01-28 12:28:16 +01:00
Benjamin Eberlei
551df4af52 [DDC-1617] Implement support for Generating Unique Constraints/Indexes in @Table annotation of EntityGenerator. 2012-01-28 11:16:36 +01:00
jsor
fac820f0e2 Complete custom column option implementation 
- Support for xml driver
- Tests
 2012-01-27 11:05:47 +01:00
Sergio Moya
88bbee127c No unique join column fields for Single Table inheritance type. 2012-01-26 17:37:50 +01:00
Jan Sorgalla
d68fcd8bd2 Implement custom options on table level 2012-01-26 15:05:26 +01:00
Benjamin Eberlei
7dae89bb02 [DDC-1619] Add QueryBuilder#distinct 2012-01-25 10:19:01 +01:00
Benjamin Eberlei
f0a09a2d52 Merge branch 'DDC-1618' 2012-01-25 00:03:56 +01:00
Thomas Rabaix
8027fca378 Add SqlWalker::HINT_DISTINCT constant 2012-01-25 00:03:40 +01:00
Thomas Rabaix
d9bb861b1f Fix DDC-1618 - add more check before throwing an iterateWithFetchJoinNotAllowed exception 2012-01-25 00:03:40 +01:00
Benjamin Michotte
1d2f46bda7 Add fluent code for relations 2012-01-24 19:08:25 +01:00
Sander Marechal
5dc0081f56 Add support for paginating WHERE NOT ... queries 
The Pagination tool throws an exception on a DQL query like:

SELECT u FROM User u WHERE NOT (u INSTANCE OF Person)

This is because Paginate does not know about the
Doctrine\ORM\Query\AST\ConditionalFactor which implements the NOT
operator. This patch adds support for that.
 2012-01-23 15:42:41 +01:00
Benjamin Eberlei
775071e1ff [DDC-1613] Merge KnpLabs/Pagerfanta Pagination into a Doctrine\ORM\Tools\Pagination namespace. Thanks to @hobodave, pablo and the knplabs team for developing and maintaining this code. 2012-01-22 13:35:06 +01:00
Fabio B. Silva
0fce3c8f97 Fix DDC-1412 2012-01-21 12:42:46 -02:00
Benjamin Eberlei
faf92883b6 [DDC-1610] Add test and fix wakeup reflection in combination with event listener 2012-01-21 13:58:25 +01:00
Benjamin Eberlei
6c24251452 [DDC-1612] Fix bug with EntityManager#flush($entity) on new entities. 2012-01-21 13:06:30 +01:00
Benjamin Eberlei
0f3abde413 [DBAL-204] Filter namespaced assets if Schemas/Emulation is not supported. 2012-01-21 11:31:54 +01:00
Guilherme Blanco
74f3ed7e29 Fixing CS. 2012-01-18 23:27:28 -05:00
Guilherme Blanco
b98280a504 Quick optimizations are always good. 2012-01-18 23:09:23 -05:00
Guilherme Blanco
d39760ba49 Fixed DDC-1608. Non-initialized PersistentCollection methods removeElement and contains now deal correctly with managed entities. 2012-01-18 01:04:25 -05:00
John Wright
543c73bc05 added optional command array as parameter for run method 2012-01-16 21:01:44 -08:00
Guilherme Blanco
c1012f7970 Merge pull request #259 from danielholmes/m2m_extra_lazy_contains 
Added fix for collection->contains with many-to-many extra lazy fetchMode
 2012-01-16 19:51:11 -08:00
Guilherme Blanco
2bb511584e Merge pull request #261 from armetiz/patch-7 
Unique key name isn't correctly set - DDC-1603
 2012-01-16 19:44:22 -08:00
Guilherme Blanco
fdb2b9c655 Optimized scalar type mapping support. 2012-01-16 14:26:13 -05:00
armetiz
21c9be74c9 Update lib/Doctrine/ORM/Tools/SchemaTool.php 2012-01-16 13:54:04 +01:00
Benjamin Eberlei
a029b28423 [DDC-1604] Have ORM Proxy implement new \Doctrine\Common\Persistence\Proxy 
* Adjust ProxyFactory to generate proxies according to new naming schema.
* Change proxy naming and file-name generation to be a bit more consistent than previous approach.

[DDC-1598] Additional regexp to check for simple ID methods to make it even more safe.
 2012-01-16 12:50:36 +01:00
armetiz
56c49fedd2 Unique key name isn't correctly set - DDC-1603 2012-01-16 10:30:15 +01:00
Daniel Holmes
a12e5ac8a7 Updated some comparisons to strict equality 2012-01-16 08:12:11 +11:00
Benjamin Eberlei
27451a59d4 Merge pull request #254 from jsor/custom_options 
Pass options attribute in @Column annotation to Schema\Column's customSchemaOptions
 2012-01-15 09:06:46 -08:00
Benjamin Eberlei
56ea4872ca DDC-1594 - Fix problem with merge and an existing managed proxy instance. 2012-01-15 15:48:44 +01:00
Benjamin Eberlei
36ce26691d DDC-1585 - Throw exception if setting target entity of the wrong type to an assocation. 2012-01-15 14:59:20 +01:00
Daniel Holmes
5deebc8738 Added fix for collection->contains when many-to-many extra lazy fetchMode 2012-01-15 23:25:57 +11:00
Benjamin Eberlei
106f10513f [DDC-1601] Fix bugs in SchemaValidator, using all modelsets as testdata for a large test 2012-01-15 11:27:52 +01:00
Guilherme Blanco
ea14bcff4a Fixed DDC-657. Added type conversion to scalar result. 2012-01-13 20:46:59 -05:00
Marcel
f76d327413 use self:: instead of EntityGenerator:: 2012-01-13 14:43:13 +01:00
Marcel
72d5d0281a use !== to check field visibility 
use class constants
 2012-01-13 14:34:34 +01:00
Marcel
69f0d70a98 fix if coding standard 
fix typo
 2012-01-13 14:14:28 +01:00
Marcel
f26d43b3ea remove whitespace 
tabs -> spaces
added class constants
updated phpdoc
 2012-01-13 11:24:35 +01:00
Guilherme Blanco
bb10211983 Fixes DDC-1596. Added table alias to discriminator column when using STI. 2012-01-12 23:58:08 -05:00
Guilherme Blanco
da7fd2ece7 Merge pull request #250 from FabioBatSilva/DDC-1575 
[DDC-1575] Give the FQCN to the naming strategy
 2012-01-12 20:45:22 -08:00
Francisco Facioni
e7a6d87990 When using a ManyToMany relationship no listener is notified about any change to the owning entity. 
What I'm doing with this patch is marking the entity for update when there is a modification in the ManyToMany relationship so the listeners are notified about it.

The main reason for this is for hooking up services like Solr or other indexers to update the entities even for ManyToMany relationships.
 2012-01-12 14:38:07 -03:00
Benjamin Eberlei
c1dae35a24 Fix notice when using regenerate if exists and file is not new. 2012-01-12 11:20:49 +01:00
jsor
615e22073f Pass options attribute in @Column annotation to Schema\Column's customSchemaOptions 2012-01-11 15:58:57 +01:00
Benjamin Eberlei
adec530c13 Merge branch '2.2' 2012-01-09 08:26:33 +01:00
Benjamin Eberlei
41ae873048 DDC-1588 - Improve ResultCache API. The default cache impl is passed to new query cache profiles automatically now. 2012-01-09 08:26:07 +01:00
Benjamin Eberlei
773fbd9edb Merge branch '2.2' 2012-01-09 08:04:44 +01:00
Benjamin Eberlei
0014afe746 Fix Typo 2012-01-09 08:04:21 +01:00
Benjamin Eberlei
e16803de61 [doctrine/common-GH-92] Fixing notice when annotation driver is used in combination with static reflection. 2012-01-09 08:02:53 +01:00
Vitali Yakavenka
53ecedf70a Remove support to pass arguments to custom ID generator's constructor 2012-01-08 15:20:35 +03:00
Vitali Yakavenka
59e9d55077 Merge doctrine/master 2012-01-06 22:06:59 +03:00
Marcel Raaijmakers
facd64ef2f enable set visibilty of class fields in EntityGenerator 2012-01-06 16:58:27 +01:00
Benjamin Eberlei
d34c39555d Bump dev version to 2.2.0 2012-01-03 22:27:03 +01:00
Benjamin Eberlei
8d3d604ed3 Release 2.2.0-BETA2 2012-01-03 22:27:03 +01:00
Fabio B. Silva
781a661704 change naming position 2012-01-03 17:58:20 -02:00
Fabio B. Silva
d8227fcd06 give the FQCN to the naming strategy 2012-01-03 16:59:43 -02:00
Benjamin Eberlei
3fff83cd13 Merge 2.2 into master 2012-01-03 19:20:11 +01:00
Benjamin Eberlei
133232eb6b Merge pull request #249 from doctrine/DCOM-93 
[DCOM-93] Remove Reflection dependency from ClassMetadata
 2012-01-03 10:12:03 -08:00
Benjamin Eberlei
a07fc515c7 DCOM-93 - Fix docblocks 2012-01-03 18:41:48 +01:00
Benjamin Eberlei
76e4f5a80b DCOM-93 - Removed reflection dependency from ClassMetadata completly, moving all the code into ClassMetadataInfo for BC reasons. 2012-01-02 21:32:18 +01:00
Benjamin Eberlei
c7d8c9f34e DCOM-93 - Factor out ClassMetadata constructor into delegate method initializeReflection 2012-01-02 17:06:22 +01:00
Benjamin Eberlei
1cecc9c429 DCOM-93 - Factor out __wakeup into a delegate-method from ClassMetadataFactory#wakeupReflection to ClassMetadataInfo#wakeupReflection 2012-01-02 15:57:32 +01:00
Benjamin Eberlei
ea2d4e4282 DCOM-93 - Add ClassMetadataFactory#wakeupReflection implementation 2012-01-02 15:46:20 +01:00
Benjamin Eberlei
80408ac34f DCOM-93 - Add empty initialize and wakeup methods. 2012-01-02 15:36:36 +01:00
Benjamin Eberlei
9bdf9a9904 DCOM-93 - Adjust ClassMetadataFactory#getClassParents() to use reflection service. 2012-01-02 15:30:25 +01:00
Benjamin Eberlei
9a0d36ae86 Fix Version 2012-01-02 15:13:48 +01:00
Benjamin Eberlei
c6730de3d1 Merge remote-tracking branch 'origin/2.2' 2012-01-02 15:13:26 +01:00
Benjamin Eberlei
239ffe468a Merge pull request #237 from asm89/ddc-551-collections-filters 
[DDC-551] Support for inheritance with filters in lazy collections
 2012-01-02 06:11:34 -08:00
Guilherme Blanco
9f3967d65d Merge pull request #245 from milokmet/DDC-1572 
[DDC-1572] Allow LIKE pattern to be a function or path expression
 2011-12-30 20:17:38 -08:00
Guilherme Blanco
4ae7851a04 Merge pull request #247 from juzna/fix-phpdoc 
fixed phpDoc and typos
 2011-12-30 13:05:37 -08:00
Jan Dolecek
12c3a42d8c fixed phpDoc and typos 2011-12-30 20:06:20 +01:00
Guilherme Blanco
e43897916a Merge pull request #246 from FabioBatSilva/DDC-1557 
[DDC 1557] Support for DQL function on subselect
 2011-12-29 11:22:23 -08:00
Fabio B. Silva
ab4482b617 update docblock 2011-12-29 17:05:44 -02:00
Miloslav Kmet
ae4321b4e3 [DDC-1572] Allow LIKE pattern to be a function or path expression 2011-12-29 19:51:48 +01:00
Fabio B. Silva
4cc61bf2ee fix DDC-1557 2011-12-29 14:30:29 -02:00
Benjamin Eberlei
87e0c69381 Merge remote-tracking branch 'origin/2.2' into 2.2 2011-12-28 20:29:53 +01:00
Benjamin Eberlei
a6deb51a05 DDC-1360 - Bugfix in quoting mechanism inside ClassMetadataInfo 2011-12-28 20:29:01 +01:00
Benjamin Eberlei
9d398afa56 DDC-1360 - Bugfix in quoting mechanism inside ClassMetadataInfo 2011-12-28 20:28:17 +01:00
holtkamp
21cfe4ba9f Allow ExporterDrivers that implement the exportClassMetadata() function to return FALSE when no content is available/needs to be written to a file by the AbstractExporter, preventing empty files to be generated foreach processed ClassMetadataInfo instance. 2011-12-28 09:03:00 +01:00
Benjamin Eberlei
e5cf1da4ee Merge pull request #235 from holtkamp/patch-1 
Allow ExporterDrivers that implement the exportClassMetadata() function to return false
 2011-12-27 23:54:09 -08:00
Adrien BRAULT
bd49aa5d2c Fix some PHPDoc @return type. 2011-12-28 08:50:17 +01:00
Fabio B. Silva
ff4ed93707 fix typo 2011-12-27 09:53:09 -02:00
Guilherme Blanco
abb258c951 Merge pull request #241 from FabioBatSilva/DDC-559 
[DDC 559, DDC 852] Naming Strategy
 2011-12-24 08:45:38 -08:00
Fabio B. Silva
603f7a1664 fix indentation 2011-12-24 12:34:49 -02:00
Fabio B. Silva
e3acf43dbc move naming classes to Doctrine\ORM\Mapping 2011-12-24 12:01:25 -02:00
Fabio B. Silva
1eddb53d6c fix CS and use php constants 2011-12-24 11:45:51 -02:00
Fabio B. Silva
8bdb713073 add support for NamingStrategy 2011-12-23 14:41:03 -02:00
Fabio B. Silva
eac34b6d6a test ClassMetadata whit UnderscoreNamingStrategy 2011-12-23 14:13:21 -02:00
Adrien BRAULT
da0a6fc619 Fix some PHPDoc @return type. 2011-12-23 17:05:08 +01:00
Fabio B. Silva
83a9458653 apply naming strategy on ClassMetadata 2011-12-23 12:28:09 -02:00
Fabio B. Silva
8b1f60c9f8 add UnderscoreNamingStrategy 2011-12-23 12:16:36 -02:00
Fabio B. Silva
537821418e apply naming strategy on ClassMetadataInfo 2011-12-23 11:29:50 -02:00
Fabio B. Silva
8368f0e4b9 change default namming strategy 2011-12-23 11:03:28 -02:00
Alexander
f49a4e9c40 Added tests for OneToMany associations and lazy collection to STI entity 2011-12-22 20:50:57 +01:00
Fabio B. Silva
909dbdf29d default NamingStrategy 2011-12-22 12:07:18 -02:00
Fabio B. Silva
c2cee0d6eb error messages 2011-12-22 11:05:11 -02:00
holtkamp
177adbdfc7 Allow ExporterDrivers that implement the exportClassMetadata() function to return FALSE when no content is available/needs to be written to a file by the AbstractExporter, preventing empty files to be generated foreach processed ClassMetadataInfo instance. 2011-12-22 09:38:55 -02:00
Alexander
62be27b295 Added tests for ManyToMany associations and lazy collection to STI entity 2011-12-22 00:25:21 +01:00
Benjamin Eberlei
f6f2acad4c Merge Improve Error Messages into 2.2 2011-12-21 23:56:25 +01:00
Benjamin Eberlei
ca470d8ba7 Fix glitch in Version produced by build-script 2011-12-21 00:00:43 +01:00
Benjamin Eberlei
0551ccca92 Bump dev version to 2.2.01 2011-12-20 22:39:27 +01:00
Benjamin Eberlei
6136654dad Release 2.2.0-BETA1 2011-12-20 22:39:27 +01:00
Fabio B. Silva
e45ebbac46 remove white spaces 2011-12-20 10:40:29 -02:00
Fabio B. Silva
24dc74a800 Fixed DDC-1539 2011-12-20 10:31:00 -02:00
Guilherme Blanco
f6eb83705a Added coverage to DDC-1521. Small CS changes. 2011-12-20 00:05:14 -05:00
Vitali Yakavenka
4879c50c5d Merge remote-tracking branch 'doctrine/master' into SupportCustomIdGenerators 2011-12-19 16:47:47 -08:00
Benjamin Eberlei
cd6131c9b8 Remove all trailing whitespaces 2011-12-19 22:56:19 +01:00
Fabio B. Silva
5c89d7ffcb support for bit comparison 2011-12-19 16:24:16 -02:00
Benjamin Eberlei
b545525e13 Update ORM to Doctrine Common master 2011-12-19 18:03:53 +01:00
Benjamin Eberlei
bf32125bad DDC-1545 - Fix issue with changing values from null to something new. 
This issue was introduced by a side-effect in 2.1.3 with
d9f9228d95c5ab2a200b3e2d2b358c598267afb1. In this commit read-only
objects where prevented to be updated. This lead to an invalid check not
being performed in UnitOfWork#computeChangeSet which was present before
where an association that was null would be injected into the
originalEntityData using the UnitOfWork#setOriginalEntityProperty()
method in the AbstractHydrator.

This commit now explicitly sets this field to null using the same API so
that is present during UnitOfWork#computeChangeSet.
 2011-12-19 17:55:19 +01:00
Benjamin Eberlei
a9035e1533 Merge remote-tracking branch 'origin/master' 2011-12-19 17:11:19 +01:00
Guilherme Blanco
68663fac4b Fixed issue when one to one badly populated when containing null values. Fixed DDC-1548. 2011-12-19 10:55:29 -05:00
Benjamin Eberlei
b1b10042d2 Revert "Fixed issue with fetched association not being considered during changeSet calculation. Fixes DDC-1545." 
This reverts commit a8478d5766.
 2011-12-19 16:31:26 +01:00
Benjamin Eberlei
40800bd3cd DDC-1530 - Validate field types in SchemaValidator 2011-12-19 10:11:11 +01:00
Benjamin Eberlei
7f8f39168a Merge pull request #227 from asm89/ddc-551-parameter-inference 
[DDC-551] Add type inference to SQLFilter::setParameter() + cleaned tests
 2011-12-19 00:47:58 -08:00
Alexander
bd07f8d3dd [DDC-551] Add type inference to SQLFilter::setParameter() + cleaned tests 2011-12-19 08:43:42 +01:00
Guilherme Blanco
a8478d5766 Fixed issue with fetched association not being considered during changeSet calculation. Fixes DDC-1545. 2011-12-19 01:39:48 -05:00
Guilherme Blanco
f6d9344d89 Merge pull request #219 from FabioBatSilva/DDC-1468 
Fixed DDC-1468
 2011-12-18 19:20:33 -08:00
Alexander
de769c6c3c [DDC-1505] joinColumn "nullable" should be handled true by default 2011-12-18 21:33:38 +01:00
Benjamin Eberlei
003d1410b0 Merge pull request #224 from doctrine/DDC-551 
DDC-551 - Filter branch
 2011-12-18 08:03:23 -08:00
Benjamin Eberlei
9cd8f85a8c DDC-1456 - Disallow setting id generators on composite identifiers. 2011-12-18 00:32:35 +01:00
Benjamin Eberlei
072094f722 DDC-1368 - Fix tests 2011-12-17 23:38:39 +01:00
Benjamin Eberlei
170271fd72 DDC-1368 - Improve schema validator 2011-12-17 23:27:39 +01:00
Evan Coury
36a47e391c DDC-1544 - Add unit test and assertions for ResolveTargetEntityListener 2011-12-17 15:00:05 -07:00
Benjamin Eberlei
267ce7df88 DDC-1544 - Add ResolveTargetEntityListener 2011-12-17 19:35:10 +01:00
Benjamin Eberlei
cfe1259400 DDC-1541 - Fix wrong references in ClassMetadataBuilder 2011-12-17 12:39:44 +01:00
Benjamin Eberlei
6015253064 DDC-1524 - Add validation and error messages for annotation named query code. 2011-12-17 12:35:22 +01:00
Benjamin Eberlei
98bd5cae64 Revert "Incorporated setAssociationTargetClass, which solves biggest problem of modular system in ZF. Any questions, pelase forward to @EvanDotPro." 
This reverts commit cac9928f28.
 2011-12-17 11:36:23 +01:00
Guilherme Blanco
cac9928f28 Incorporated setAssociationTargetClass, which solves biggest problem of modular system in ZF. Any questions, pelase forward to @EvanDotPro. 2011-12-16 16:16:22 -05:00
Asmir Mustafic
289c186de5 orphanRemoval default is false 2011-12-16 16:16:52 +01:00
Benjamin Eberlei
5b5fb2b732 DDC-1514 - Fix complex self-referencing + proxy hydration problem. 2011-12-15 23:00:01 +01:00
Benjamin Eberlei
e8a47b3921 DDC-1519 - Fix bug in merging of entities that contain foreign identifiers 2011-12-15 20:49:25 +01:00
Fabio B. Silva
017a7d889f Fixed DDC-1468 2011-12-15 17:12:01 -02:00
Guilherme Blanco
41a3d90a57 Merge pull request #214 from yethee/xml_driver 
Fixed typo in the XmlDriver
 2011-12-13 20:07:43 -08:00
Benjamin Eberlei
99e46a23c6 Bugfix in UnitOfWorklib/Doctrine/ORM/UnitOfWork.phptriggerEagerLoads() 2011-12-13 21:26:04 +01:00
Benjamin Eberlei
f7ede572e0 DDC-1415 - Remove EntityEventDelegatee, the API sucks and we need another approach. 2011-12-12 16:46:53 +01:00
Benjamin Eberlei
43ef8765fd DDC-1527 - Port bugfix for master branch 2011-12-12 16:39:52 +01:00
Andrew Mackrodt
ef12a09ae0 Added remaining absolute namespace paths to phpdoc annotations - issue DDC-1025. 2011-12-11 21:56:27 +00:00
Andrew Mackrodt
2fdb55a878 Added absolute namespace paths to phpdoc annotations - issue DDC-1025. 2011-12-11 21:56:26 +00:00
Benjamin Eberlei
b6d776f75d DDC-551 - rework walker filtering 2011-12-11 21:14:09 +01:00
Benjamin Eberlei
ad6130b02d DDC-551 - Cleanup filters branch, especially inheritance related code and yoda conditions and some inconsistencies 2011-12-11 19:29:36 +01:00
Benjamin Eberlei
ca5dbb182a DDC-551 - Make filters case-sensitive everywhere 2011-12-11 19:27:50 +01:00
Benjamin Eberlei
69b1eb5c64 DDC-551 - Fix locking mess with filters 2011-12-11 18:46:57 +01:00
Benjamin Eberlei
0f501114eb Merge branch 'master' into DDC-551 2011-12-11 18:39:11 +01:00
Benjamin Eberlei
f7175c229e DDC-551 - Fix some ugly yoda conditions and a wrong nesting. 2011-12-11 18:39:04 +01:00
Benjamin Eberlei
40d094fea2 DDC-1515 - Now the real bugfix 2011-12-11 17:08:58 +01:00
Benjamin Eberlei
57970499fd Revert "DDC-1515 - Merge from 2.1.x" 
This reverts commit bd0fb574e3.
 2011-12-11 16:11:16 +01:00
Benjamin Eberlei
bd0fb574e3 DDC-1515 - Merge from 2.1.x 2011-12-11 16:07:35 +01:00
Deni
2ce9246733 Fixed typo in the XmlDriver 2011-12-11 17:24:38 +04:00
Guilherme Blanco
954b5077e4 Fixed nesting recursion error in some situations. Complement to DDC-1276. 2011-12-09 10:59:53 -05:00
Guilherme Blanco
0febf06114 Made ClassMetadataBuilder support ClassMetadataInfo instead of ClassMetadata. Fixed DDC-1508. 2011-12-09 00:04:47 -05:00
Fabio B. Silva
8e50a31b98 trying remove whitespaces 2011-12-07 12:31:23 -02:00
Fabio B. Silva
c6a89c64f3 put return after comment 2011-12-07 12:16:27 -02:00
Fabio B. Silva
df19e68a86 Fixed DDC-1057 2011-12-07 11:23:15 -02:00
Alexander
5e91f0c1ca [DDC-551] Update SQLWalker to reflect filter requirements for inheritance 2011-12-07 10:02:15 +01:00
Alexander
efe7a01482 [DDC-551] Fixed CS, comments by @stof 2011-12-05 23:00:52 +01:00
Alexander
f4663f4512 [DDC-551] Another batch of small refactorings 2011-12-05 22:19:54 +01:00
Alexander
e8d30068e2 [DDC-551] Various refactorings 2011-12-05 22:05:42 +01:00
Alexander
04635ad4ff Merge remote-tracking branch 'upstream/master' into DDC-551 
Conflicts:
	lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
	lib/Doctrine/ORM/Persisters/OneToManyPersister.php
 2011-12-05 21:53:34 +01:00
Alexander
3b7d16c60f [DDC-551] General cleanup of the code. 2011-12-05 21:14:31 +01:00
Fabio B. Silva
33c68df3ba Fixed DDC-1170 2011-12-05 17:35:49 -02:00
Alexander
4c842974b4 [DDC-551] Add filters only on root entities in SingleTablePersister 2011-12-05 18:56:44 +01:00
Alexander
752b502326 [DDC-551] Add filters only on root entities in JoinedSubclassPersister 2011-12-05 18:26:56 +01:00
Alexander
e98c775f0d Revert "[DDC-551] Initial support for filters in the JoinedSubclassPersister" 
This reverts commit f6d5f0481e.
 2011-12-05 16:14:04 +01:00
Guilherme Blanco
0380d5ae58 Implemented multiple enhancements in InExpression support for DQL. Fixed DDC-1472 and DDC-1416. 2011-12-04 02:41:54 -05:00
Guilherme Blanco
a26990c3e8 DDC-1457: Fixed wrong docblock. 2011-12-04 02:14:47 -05:00
Guilherme Blanco
2f6b930a8d Implemented missing support in CollectionMemberComparison. Removed old todo in ArrayHydrator. Finished implementation of IdentificationVariable in ArithmeticPrimary. 2011-12-03 15:19:21 -05:00
Guilherme Blanco
2642daa438 Fixed DDC-1236: GROUP BY now supports ResultVariable and IdentificationVariable. Composite PK is also supported. If you are willing to group by an aggregate function or a function itself, just place it in SELECT expression then refer to it in the GROUP BY clause. If you are not willing to have the function being part of your resultset, just mark the column as HIDDEN and you are done. 2011-12-01 23:52:35 -05:00
Benjamin Eberlei
619a31913a DDC-1517 - Fix EntityRepository#find() and EntityManager#getReference() breaking on invalid or missing identifiers. 2011-12-01 21:18:39 +01:00
Guilherme Blanco
5e3e8b3957 More refactorings and optimizations. 2011-12-01 10:00:26 -05:00
Alexander
bf1cc29a2a [DDC-551] Fixed some comments 2011-12-01 09:46:02 +01:00
Alexander
f6d5f0481e [DDC-551] Initial support for filters in the JoinedSubclassPersister 
Still some things to do.
 2011-11-30 23:01:10 +01:00
Alexander
4c94a7ccc5 [DDC-551] Various minor fixes after merge and cleanup 2011-11-30 16:40:55 +01:00
Guilherme Blanco
5b73f1bd82 Improved code readability. Improved performance. 2011-11-30 09:57:54 -05:00
Vitali Yakavenka
353ba4dfd1 Remove trailing whitespaces and fix brace locations 2011-11-30 00:20:00 +03:00
Vitali Yakavenka
f13f44a2fc Merge branch 'master' of git://github.com/doctrine/doctrine2 into SupportCustomIdGenerators 2011-11-29 23:42:01 +03:00
Guilherme Blanco
356f5874bf Added support to removeElement remove items without initializing the PersistentCollection. 2011-11-29 11:29:17 -05:00
Guilherme Blanco
24f6b74427 Refactored UnitOfWork::createEntity, improving its performance. 2011-11-29 10:36:32 -05:00
Vitali Yakavenka
c92b78bc06 Cleanup formatting just a little 2011-11-29 00:48:08 +03:00
Vitali Yakavenka
b72d150d33 Rename custom-generator to custom-id-generator in XML mappint to match name in other mapping types 2011-11-28 23:36:23 +03:00
Vitali Yakavenka
a8787be0bf Add missing files from last comming and newly required one after rebase 2011-11-28 23:31:06 +03:00
Vitali Yakavenka
84086915e4 Add support for custom ID generator in Yaml driver 2011-11-28 23:30:32 +03:00
Vitali Yakavenka
2b97f79bd3 Add support for custom ID generator in XML 2011-11-28 23:30:32 +03:00
Vitali Yakavenka
48b6356e53 Add support for GenerateValue(strategy='CUSTOM') in AnnotationDriver 2011-11-28 23:29:42 +03:00
Vitali
82daf651fb Pass specified arguments to generator's constructor 2011-11-28 23:24:19 +03:00
Vitali
cd0915deb5 Introcude ClassMetadataInfo::GENERATOR_TYPE_CUSTOM for custom generators to follow current implementation 2011-11-28 23:24:18 +03:00
Vitali
ffc722a334 Allow loading of custom ID generator class by FQN in @GeneratedValue(type=) 2011-11-28 23:24:18 +03:00
Benjamin Eberlei
62ec98a9fc Merge pull request #205 from Seldaek/psr0 
PSR-0 compliance
 2011-11-28 05:05:50 -08:00
Benjamin Eberlei
0c12d3ed5a DDC-1512 - Make ClassMetadataFactory::isTransient() entity namespace aware. 2011-11-28 11:16:23 +01:00