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,946 Commits 5 Branches 0 Tags 32 MiB
25849a3412
Commit Graph

2951 Commits

Author SHA1 Message Date
Javier Spagnoletti
1378626937 Fixed new line in docblock (247803715b). 2014-08-29 22:49:23 -03:00
František Bereň
d48be34696 CS Fixes 2014-08-28 13:17:25 +02:00
Guilherme Blanco
4b504c9436 Merge pull request #1109 from doctrine/hotfix/DDC-3120-php-5.6-RC3-compat 
DDC-3120 - PHP 5.6-RC3 compatibility
 2014-08-27 12:27:05 -04:00
Christophe Coevoet
00eb0d3b67 Fixed the structure of the reverse-engineered mapping 2014-08-27 13:56:02 +02:00
Marco Pivetta
45d74e7220 DDC-3276 - #1122 - updating EBNF in docblock to reflect new syntax support 2014-08-27 02:12:08 +02:00
Marco Pivetta
097840dc93 Allowing expression in COUNT() DQL aggregation functions 2014-08-27 01:56:11 +02:00
Steve Müller
8d3fba5540 improve schema validator error message for invalid bi-directional relations 2014-08-26 19:46:17 +02:00
Steve Müller
ad1f228ef6 fix DocBlock 2014-08-22 09:26:54 +02:00
Guilherme Blanco
400acad533 Merge pull request #1105 from deeky666/nested-embeddables 
Add support for nesting embeddables
 2014-08-21 16:33:44 -04:00
Marco Pivetta
ff80187930 Merge pull request #1098 from encoder32/DDC-1590 
#DDC-1590: Fix Inheritance in Code-Generation
 2014-08-18 22:35:52 +02:00
Marco Pivetta
dfbaac0401 #1112 - Fixed type-hint that is incompatible with most IDEs 2014-08-18 15:18:59 +02:00
Marco Pivetta
aab7fce2d4 #1112 - Elvis operator reduces code duplication even more 2014-08-18 15:17:54 +02:00
Marco Pivetta
bf03694e28 #1112 - Yoday need you may, better IDE hinting as well needed is. 2014-08-18 15:16:45 +02:00
Marco Pivetta
19d3552f2a #1112 - Removing useless trimming of the entity name being passed in 2014-08-18 15:14:53 +02:00
Marco Pivetta
3fed769b40 #1112 - avoiding useless assignments/splitted return statement 2014-08-18 15:02:34 +02:00
Marco Pivetta
7865de92ab #1112 - renamed $class to $className 2014-08-18 15:01:52 +02:00
Giorgio Premi
a665cb0229 DefaultRepositoryFactory: single repository for aliased entities 2014-08-18 14:52:01 +02:00
Vincent Composieux
edc2ed9512 Fix QueryException::instanceOfUnrelatedClass() message 2014-08-15 15:39:56 +02:00
Marco Pivetta
361ec2a474 DDC-3120 - using Doctrine\Instantiator when building new instances 2014-08-14 15:51:48 +02:00
Saša Stamenković
133bd288bf Minor CS fix 2014-08-12 09:57:19 +02:00
Steve Müller
0768916a06 fix handling infinite nesting of embeddables 2014-08-12 07:56:39 +02:00
Steve Müller
bca9d31531 add support for nesting embeddables 2014-08-11 16:53:18 +02:00
Adrien Crivelli
1003466a5f Surround ! with spaces according to code style 2014-08-05 18:07:00 +09:00
Marco Pivetta
723529ffff Merge pull request #1069 from anho/reuse-console-app 
added method to be able to reuse the console application
 2014-08-04 16:17:11 +02:00
encoder64
4e805bb59a #DDC-1590: Fix Inheritance in Code-Generation: Code Style Fixes 2014-08-03 17:07:20 +03:00
encoder64
e0ae7634d5 #DDC-1590: Fix Inheritance in Code-Generation 2014-08-03 17:02:33 +03:00
František Bereň
a37f99f242 Root selection according other pagination tools 
changed root selection in Walkers from looping queryComponents to using
$AST->fromClause as other walkers have
 2014-07-30 15:55:14 +02:00
František Bereň
114bd2435f Arbitrary Join count walkers solution 
Possible solution for Arbitrary Join problem in pagination count
walkers:
https://groups.google.com/forum/#!topic/doctrine-user/rpPYCDNKOU8

Added a condition to test query component against  SelectStatement from
clause
 2014-07-30 09:56:22 +02:00
Adrien Crivelli
27adf8d6e9 Refactor partial into options array 
This coherent with what is done for Table. All platform specific things
are grouped into an options array. Eventually flags should be migrated
into options as well.
 2014-07-22 10:32:31 +09:00
Adrien Crivelli
eeb7ff4a6d Support for Partial Indexes for PostgreSql and Sqlite 
Support for Partial Indexes was available in Doctrine 1 following
http://www.doctrine-project.org/jira/browse/DC-82. This commit
reintroduce support for Doctrine 2. We use the same syntax with an
optionnal "where" attribute for Index and UniqueConstraint.
 2014-07-22 10:32:30 +09:00
Rhodri Pugh
ad10a18071 added more informative error messages when invalid parameter count 2014-07-15 13:17:22 +01:00
Andreas Flack
0ade3aa62a Improve phrasing on exception message instead of trying to fix callers 2014-07-14 11:25:04 +02:00
flack
b8ef3af982 Small grammar fix 
The exception was reading 

```
A detached entity was found during {removed|persisted} [entityName] 
```

I changed the verbs to infinitive now. Alternatively, the text in ``ORMInvalidArgumentException::detachedEntityCannot`` could also be changed to read 


```
Detached entity [entityName] cannot be {removed|persisted}  
```
 2014-07-14 11:25:04 +02:00
Marco Pivetta
90dee7036d Merge pull request #1067 from albertvolkman/add-fullstop-and-newline 
Add fullstop and newline after property description.
 2014-07-14 11:09:40 +02:00
Marco Pivetta
b80149344d Merge pull request #1073 from kamazee/add_passing_type_to_rsm_in_sql_walker 
Add missing type mapping
 2014-07-14 10:51:13 +02:00
Alexander Kurilo
38fcc66c16 Add missing type mapping 
Fixes DDC-3192
Refs DDC-2494

This is essentially a fix from DDC-2494 applied to SQLWalker.
The issue: type was not converted to PHP value when the result is fetched by
executing DQL query rather than using entity manager's findX(). Similar issue
for BasicEntityPersister (which is used when em's findX is executed) was fixed
in DDC-2494, but SQLWalker made the issue valid for any custom query.
 2014-07-14 11:22:08 +03:00
Daniel Sippel
45358bf5d0 possible fix for DDC-2021 2014-07-09 16:39:44 +02:00
Marco Pivetta
a8035f25a2 Merge pull request #1074 from zimmermanj42/DDC-3160 
[DDC-3160] Alternate fix for DDC-2996 bug
 2014-07-06 16:07:43 +02:00
Justin Zimmerman
65e7cc9143 [DDC-3160] Change to fix that was implemented for DDC-2996. 
A fix for DDC-2996 was implemented that broke quite a few extensions.

This commit is an attempt to fix the DDC-2996 bug without the adverse side effects seen in DDC-3160.

Basically, if changes are detected that would cause a changeset to be made, but the entity is awaiting insertion, the code will not save the changeset nor flag the entity as awaiting updating in the Unit of Work.

Some styling tweaks based on Pull Request guidelines.
 2014-07-04 10:51:04 -04:00
velosipedist
60cb01be1f Fix switch non-uniform syntax 2014-06-29 18:00:02 +04:00
Antonio Vilar
4e61ceb0df Added platform key 2014-06-27 22:36:02 +02:00
Antonio Vilar
0dde8585c3 Fixed query cache id generation: added platform to hash 2014-06-27 20:29:55 +02:00
Vasek Purchart
ee5f465a2f set namespace in setup only on CacheProvider instances 2014-06-26 01:29:35 +02:00
Andreas Hörnicke
eef32d4372 added method to be able to reuse the console application 2014-06-24 11:02:24 +02:00
Albert Volkman
247803715b Add fullstop and newline after property description. 2014-06-23 09:53:27 -04:00
Guilherme Blanco
38187a31d6 Merge pull request #1032 from bakura10/optimized-contains 
Add support for optimized contains in LazyCriteria
 2014-06-21 08:56:47 -04:00
FlorianLB
fdca5d7584 singularize variable name on add/remove methods for EntityGenerator 2014-06-19 10:00:40 +02:00
Ulf
a7aa634247 Fixed mapping of discriminator column 
Added fix for [DDC-3170] (http://www.doctrine-project.org/jira/browse/DDC-3170).

When querying a simple entity which uses single table- or class table inheritance using simple object hydration (``AbstractQuery::HYDRATE_SIMPLEOBJECT``), the mapped discriminator column was not retrieved correctly.

If the column got an alias during result set mapping other than it's actual name (e.g. ``type34`` insteaad of ``type``) than this alias wasn't reverted when retrieving the discriminator column from the SQL result set.
 2014-06-17 14:51:19 +02:00
Marco Pivetta
3ade0cf6a5 Merge pull request #1048 from MidnightDesign/patch-1 
Fix typo in exception message
 2014-06-06 04:34:50 +02:00
Steve Müller
dcf8d6a86e ignore case when checking for existing methods to avoid redeclaration on update 2014-06-05 15:58:54 +02:00
Rudolph Gottesheim
daa90bf32d Fix typo in exception message 2014-06-04 15:59:57 +02:00
Benjamin Eberlei
46ebb57b45 Fix wrong version 2014-06-03 21:41:26 +02:00
Benjamin Eberlei
e577e77867 Cleanup 93c276d 2014-06-03 17:05:02 +02:00
Marco Pivetta
72750b05e6 Using PHP_VERSION_ID instead of version_compare to see if we're using PHP 5.4+ 2014-05-31 13:37:39 +02:00
Renaud LITTOLFF
93c276d059 Fix the "Erroneous data format for unserializing" error message 2014-05-30 10:43:11 +02:00
Marco Pivetta
5ee286e7e0 Merge pull request #1041 from c960657/entity-manager-interface 
Allow all EntityManagerInterface implementations
 2014-05-28 14:40:22 +02:00
Christian Schmidt
a7d072f525 Allow all EntityManagerInterface implementations 
This is necessary if Doctrine\ORM\Decorator\EntityManagerDecorator is used.
 2014-05-28 12:30:40 +02:00
Dawid Spiechowicz
9c24e0b510 I can't look at those semicolons, sorry ;-) 2014-05-27 09:37:40 +02:00
Albert Volkman
49bca5171b Move space addition to implementation. 2014-05-21 16:27:36 -04:00
Michaël Gallego
140dc92e5f Enforce Criteria 2014-05-18 12:47:59 +02:00
Marco Pivetta
a259138180 The count in a LazyCriteriaCollection is null on initialization 2014-05-17 19:08:25 +02:00
Michaël Gallego
8a8c6ea3a6 Remove extra phpdoc 2014-05-17 14:53:06 +02:00
Michaël Gallego
ddfc951a0e Remove useless docblock 2014-05-17 14:33:15 +02:00
Michaël Gallego
239b862665 Add missing typehint 2014-05-17 13:00:47 +02:00
Michaël Gallego
a04113f410 Add support for optimized contains 2014-05-17 12:54:25 +02:00
Guilherme Blanco
d6c727dcc1 Update LazyCriteriaCollection.php 
Fixed issue where count = 0
 2014-05-16 14:03:20 -04:00
Matthieu Napoli
5a4c558865 Fixed #991 to support non-closure callables on PHP 5.3 2014-05-16 10:49:59 +02:00
Matthieu Napoli
b16423b26b Documentation for #991 2014-05-16 09:32:52 +02:00
Guilherme Blanco
47ca10076b Merge pull request #991 from mnapoli/custom-functions-callback 
Ability to define custom functions with callback instead of class name
 2014-05-16 00:27:30 -04:00
Guilherme Blanco
d30e3ab43c Added count cache when lazy collection is not yet initialized. Some cosmetic changes (primarily, there's no ELSE). 2014-05-16 04:22:11 +00:00
Michaël Gallego
11de4c2e72 Only create lazy collection for EXTRA_LAZY 2014-05-15 18:22:57 +02:00
Michaël Gallego
50832fd3bc Add tests for PersistentCollection 2014-05-15 18:22:57 +02:00
Michaël Gallego
6cb5097ea8 Add method visibility 2014-05-15 18:22:57 +02:00
Michaël Gallego
8514ec7320 Remove useless imports 2014-05-15 18:22:57 +02:00
Michaël Gallego
3c522f4984 Reuse Doctrine Collection Lazy Collection 2014-05-15 18:22:57 +02:00
Michaël Gallego
28afb52734 Typehint to interface to support second level cache 2014-05-15 18:22:56 +02:00
Michaël Gallego
ac15b184b6 Fix tests for inheritance support 2014-05-15 18:22:56 +02:00
Michaël Gallego
632382b069 Add missing methods to the mock 2014-05-15 18:22:56 +02:00
Michaël Gallego
7551b1ad00 Update to latest cache API 2014-05-15 18:22:56 +02:00
Michaël Gallego
9813c2d5f1 Add tests 2014-05-15 18:22:56 +02:00
Michaël Gallego
0fa7b45a0e Also add efficient count for Persistent collection 2014-05-15 18:22:56 +02:00
Michaël Gallego
9b7dce1940 Use inner collection count if initialized 2014-05-15 18:22:56 +02:00
Michaël Gallego
b556bcb16c Remove useless dependency 2014-05-15 18:22:56 +02:00
Michaël Gallego
f1a793f2ee Initial work for efficient counting on criteria 2014-05-15 18:22:56 +02:00
Matthieu Napoli
c7eb42b04f Ability to define custom functions with callback + tests 2014-05-15 12:06:21 +02:00
Guilherme Blanco
5c828fc6c8 Merge pull request #1023 from coma/DDC-3027 
[DDC-3027] Avoid duplicated mapping using Embedded in MappedSuperclass
 2014-05-14 22:37:24 -04:00
Guilherme Blanco
4874070b3f Merge branch 'feature/default-query-hints' of https://github.com/Strate/doctrine2 into Strate-default-query-hints 2014-05-15 01:15:34 +00:00
Marco Pivetta
ccc789eadd DDC-3123 - the UoW should clear extra updates immediately 2014-05-15 00:18:50 +02:00
flack
5cf906d76b Remove some redundant clauses 2014-05-02 21:52:00 +02:00
Eduardo García Sanz
8a3def097f [DDC-3027] Avoid duplicated mapping using Embedded in MappedSuperclass 2014-04-30 11:46:54 +02:00
Marco Pivetta
27845088e3 Merge branch 'hotfix/DDC-3103-#1020-serialize-isEmbedded-in-class-metadata' 
Close #1020
 2014-04-29 13:16:02 +02:00
Marco Jantke
f065a5c8b9 fixed bug 2014-04-29 09:30:37 +02:00
Guilherme Blanco
48172f3a53 Readability update to hydrators. 2014-04-29 05:05:38 +00:00
Guilherme Blanco
9cd16ec56a More optimizations around hydrators. Pretty much same performance, just better memory footprint (-0.25MB). 2014-04-28 13:47:57 +00:00
Guilherme Blanco
be94eb9d1f Made ClassMetadata to be reused during gatherRowData() and also during hydrateRow() to share same fetches instead of recalculating all info again. Performance improvement after 100x runs comparison is around 4%. 2014-04-28 02:38:51 +00:00
Guilherme Blanco
35c8cd7f23 Added type conversion to meta column in case a type is specified (such as a foreign key or discriminator column). 2014-04-25 05:22:33 +00:00
Guilherme Blanco
21437bb276 Heavily simplified code on simple object hydrator. Code cleanup on column information cache; by reference cache variable is no longer needed and protected variable is used in a standardized way everywhere. 2014-04-25 03:41:14 +00:00
Cédric Chandon
9ba31a394a [DBAL-878] Wrong mapping type 
the type should be the mapping type, and not the name of the type. This
does the difference for simple_array, as the result should be
simple_array and not simplearray
 2014-04-25 01:59:15 +02:00
Guilherme Blanco
f7de00b401 Finalized fix for scalars and newObjects. 2014-04-24 05:21:24 +00:00
Guilherme Blanco
9692fc8c5b Fixed issue if aliases were specific names, you would either get completely misleading results (dql alias: scalars) or a fatal error (dql alias: newObjects). 2014-04-24 04:47:13 +00:00