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

6830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Eberlei
5e2a433828 Inlined Test and Entities into DDC2138Test 2012-11-12 14:59:48 +01:00
Stefano Rodriguez
482da95352 The schema tool now doesn't add a foreign constraint when subclassess of a STI use the same field to map relations with entities of different classes 2012-11-12 14:59:48 +01:00
Stefano Rodriguez
b1c69ebab9 adedd failing test for PR #440 2012-11-12 14:19:31 +01:00
Benjamin Eberlei
4e04daaed4 Merge pull request #466 from ethanresnick/patch-1 
Use `protected` so EntityGenerator can be extended
 2012-11-12 04:05:23 -08:00
HarmenM
b6b75d3a27 Modified the WhereInWalkerTest to be compatible with a single InputParameter. 2012-11-12 12:30:03 +01:00
HarmenM
8a29d91d15 Update lib/Doctrine/ORM/Tools/Pagination/Paginator.php 
Replaced the foreach loop adding all IDs as single parameters with a single parameter which injects the IDs as an array.
 2012-11-12 12:30:03 +01:00
HarmenM
88d0933a6e Update lib/Doctrine/ORM/Tools/Pagination/WhereInWalker.php 
replaced the for-loop which adds the InputParameters for a single InputParameter for use with an array instead of a set of scalars.
 2012-11-12 12:30:03 +01:00
Benjamin Eberlei
a0e8ca128c Merge pull request #482 from Halleck45/cli-customizable 
user can set its own commands in the cli-config.php file
 2012-11-12 03:13:34 -08:00
Benjamin Eberlei
79315cb7de Merge pull request #510 from ruian/patch-2 
CS on QueryBuilder
 2012-11-12 02:52:54 -08:00
Benjamin Eberlei
ccfd2adf5b Merge pull request #511 from Ocramius/hotfix/console-runner-version 
Fixing reference to Doctrine\ORM\Version
 2012-11-12 02:42:30 -08:00
Marco Pivetta
7520a745c2 Fixing reference to Doctrine\ORM\Version 2012-11-12 11:31:19 +01:00
Julien 'ruian' Galenski
055d7f261c CS on queryBuilder 2012-11-12 10:23:50 +01:00
Benjamin Eberlei
fa3f1e088d Add test for boolean parameter type infering 2012-11-09 22:03:40 +01:00
Guilherme Blanco
182ed07a41 Merge pull request #509 from smottt/master 
SchemaTool ignoring 'fixed' option
 2012-11-07 13:58:56 -08:00
Metod
cfee331006 SchemaTool ignoring 'fixed' option fixed 2012-11-07 16:31:31 +01:00
Guilherme Blanco
09d53f0e58 Merge pull request #508 from mnapoli/DDC-2073 
Fix and test for DDC-2073
 2012-11-06 14:52:34 -08:00
Matthieu Napoli
c2d9197900 Fix and test for DDC-2073 2012-11-06 15:12:19 +01:00
Matthieu Napoli
e15cf324c3 Fix and test for DDC-2073 2012-11-06 15:05:53 +01:00
Guilherme Blanco
d6d5c341e2 Merge pull request #486 from FabioBatSilva/DDC-2084 
Fix DDC-2084
 2012-11-05 16:38:35 -08:00
Guilherme Blanco
262c3eea6b Merge pull request #506 from FabioBatSilva/DDC-2121 
Fix DDC-2121
 2012-11-05 16:27:34 -08:00
Fabio B. Silva
62f43e6ea2 remove require_once 2012-11-05 22:23:44 -02:00
Fabio B. Silva
c4e6a04676 remove duplicate return statement 2012-11-05 22:23:44 -02:00
Fabio B. Silva
a09a5b9b7b Fix DDC-2084 2012-11-05 22:23:44 -02:00
Guilherme Blanco
57e5fa9873 Merge pull request #496 from arse/master 
Testing for key existance in basicEntityPersister / getIndividualValue
 2012-11-05 16:20:26 -08:00
Guilherme Blanco
a44579303c Merge pull request #493 from nmpolo/codegenerationfixes 
Do not add trailing whitespace to blank lines
 2012-11-05 16:19:39 -08:00
Guilherme Blanco
863d14a61a Merge pull request #503 from sebastianbauer/master 
added unsigned mapping to SchemaTool options
 2012-11-05 16:16:25 -08:00
Guilherme Blanco
7a895209e3 Merge pull request #502 from gwis/master 
Fix for invalid 'double-ON' SQL generation with entity inheritance type JOINED.
 2012-11-05 16:15:45 -08:00
Guilherme Blanco
283ed55824 Merge pull request #504 from nemekzg/DDC-1241 
Proposed fix for DDC-1241
 2012-11-05 16:14:48 -08:00
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
Guilherme Blanco
ff80e99cc9 Merge pull request #501 from jeremymarc/patch-1 
Allow 0 id for Entity
 2012-11-04 19:22:57 -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
Guilherme Blanco
fc40c437cb Merge pull request #489 from stof/cs_fixes 
Fixed coding standards in the Tools namespace
 2012-11-03 10:04:10 -07:00
Christophe Coevoet
1b01a074dc Fixed the testsuite 2012-11-03 17:07:56 +01: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