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

8134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Eberlei
cedcac225f Merge branch 'DDC-2759' 2013-10-26 11:16:21 +02:00
Benjamin Eberlei
9a3298347c [DDC-2759] Fix regression in ArrayHydrator introduced in DDC-1884 at SHA c7b4c9bf0f 2013-10-26 11:16:07 +02:00
Chris Collins
7249804e3f Added a failing test case for DDC-2759. 2013-10-24 13:02:42 +01:00
Marco Pivetta
b7cb1e98ee Merge pull request #825 from flack/patch-1 
Spelling fix
 2013-10-23 02:32:45 -07:00
flack
195b1169ae Spelling fix 2013-10-23 11:32:04 +02:00
Marco Pivetta
0a31ecb283 Merge pull request #824 from brikou/patch-3 
s/PostgreSQLPlatform/PostgreSqlPlatform/
 2013-10-21 00:45:51 -07:00
Brikou CARRE
84b980227f s/PostgreSQLPlatform/PostgreSqlPlatform/ 2013-10-21 09:44:48 +02:00
Marco Pivetta
a96fe8770c Merge pull request #815 from nicolas-bastien/patch-2 
Remove unused use statement
 2013-10-18 03:46:09 -07:00
Marco Pivetta
d2e731174c Merge pull request #821 from mnapoli/patch-4 
Fixed documentation rendering
 2013-10-17 07:18:12 -07:00
Matthieu Napoli
a90311cb44 Fixed documentation rendering 
The 2 lists I've fixed render as citation in the docs: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/index.html

If I didn't make any mistake, now they should render as simple lists.
 2013-10-17 15:53:45 +02:00
Marco Pivetta
1e10fca66a Merge pull request #818 from mfdj/master 
Clarified tutorial context in section introducing `orm:scehma-tool:*` commands
 2013-10-16 17:23:09 -07:00
Guilherme Blanco
95ad926c95 Merge pull request #819 from vbourdeix/master 
Fixes a Fatal Error when using a subexpression in parenthesis
 2013-10-14 11:01:51 -07:00
Vincent BOURDEIX
5506d7adce Fixes a Fatal Error when using a subexpression in parenthesis 
When some dql contains a subselect with expression in parenthesis, the
expression of the $simpleSelectExpression parameter given to
walkSimpleSelectExpression is an instance of AST\ParenthesisExpression.
Before this commit, this case defaulted to
$this->walkEntityIdentificationVariable($expr) where $expr is supposed
to be a string. A fatal error was then yielded.
 2013-10-14 15:04:52 +02:00
Guilherme Blanco
0d58e82b76 Merge pull request #817 from mfdj/patch-1 
Removed "minimum-stability" : "dev" from composer.json
 2013-10-11 19:34:57 -07:00
Mark Fox
2f8b0801cc further tweaking of last commit pt.2 2013-10-11 15:22:39 -07:00
Mark Fox
126cd0bac2 further tweaking of last commit 2013-10-11 15:20:53 -07:00
Mark Fox
c5adfca0ed Clarified tutorial context around introduction of orm:schema-tool:* commands 
See: http://stackoverflow.com/questions/17473225/doctrine2-no-metadata-classes-to-process for evidence of this confusion
 2013-10-11 15:16:46 -07:00
Mark Fox
006dac13a9 Removed "minimum-stability" : "dev" from composer.json 2013-10-11 14:34:49 -07:00
Guilherme Blanco
bb63058410 Merge pull request #780 from terite/DDC-2655 
[DDC-2655] Don't let getOneOrNullResult throw NoResultException
 2013-10-11 13:43:27 -07:00
Guilherme Blanco
be81b46d8e Merge pull request #791 from myclabs/CriteriaContains 
Implemented "contains" operator for Criteria expressions
 2013-10-11 06:33:40 -07:00
David Stensland
089006927e [DDC-2655] Don't let getOneOrNullResult throw NoResultException 2013-10-09 11:38:33 -04:00
Guilherme Blanco
ded3d20630 Merge pull request #787 from flip111/patch-1 
Update DDC719Test.php to be compatible with MsSQL
 2013-10-07 11:22:14 -07:00
Nicolas Bastien
33ddb9c0ca Remove unused use statement 2013-10-07 15:58:41 +02:00
Guilherme Blanco
3f883d57a6 Merge pull request #811 from flip111/patch-6 
Update SingleScalarHydrator error message
 2013-10-02 06:07:59 -07:00
flip111
62ae8dc81e Update SingleScalarHydrator error message 
bummed into this one. Now more developer friendly :)
 2013-10-02 14:12:35 +02:00
Benjamin Eberlei
fc53bc8909 Fix some LGPL occurances to MIT 2013-10-02 12:07:37 +02:00
Guilherme Blanco
2021d12df8 Merge pull request #809 from FabioBatSilva/DDC-1514 
Fix DDC-1514 test
 2013-10-01 22:02:22 -07:00
fabios
dd4bdd776a Fix DDC-1514 test 2013-10-01 12:00:52 -04:00
flip111
4282fa4787 Used ternary operator to reduce LOC 2013-10-01 17:25:49 +02:00
Guilherme Blanco
2c4c26c5d6 Merge pull request #801 from flip111/patch-4 
Update SqlWalker.php fixed wrong GROUP BY clause on SQL Server platform
 2013-10-01 08:21:20 -07:00
flip111
228a501014 Made the code prettier :) 2013-10-01 16:53:53 +02:00
Guilherme Blanco
4051d0da86 Merge pull request #807 from janbster/fix-optimisticlock 
Fix for OptimisticLockingException
 2013-10-01 07:41:57 -07:00
jan brunnert
f64d6695ce Removed unnecessary is_object() check 2013-10-01 13:00:37 +02:00
Guilherme Blanco
0e8e5c9ba5 Merge pull request #788 from flip111/patch-3 
Update DatabaseDriverTest.php
 2013-09-30 11:08:41 -07:00
Guilherme Blanco
d8335eee7b Merge pull request #793 from flip111/patch-2 
Improved error messages in Paginator: LimitSubqueryOutputWalker
 2013-09-30 11:07:49 -07:00
Guilherme Blanco
f02d18f465 Merge pull request #804 from diego-mazzaro/master 
[bugfix] if BIGINT or SMALLINT version field was not incremented.
 2013-09-30 07:46:35 -07:00
jan brunnert
a4e3921090 When the OptimisticLockingException is generated with the static function lockFailedVersionMismatch and the passed parameters are DateTime instances, the exception could not be thrown because the DateTime object is not implicitly converted to a string. 2013-09-30 11:32:46 +02:00
flip111
72ae7f5497 Changed GroupBy alias to real column name for all platforms and adjusted failing test accordingly. Has fallback in cases where real column name is not possible (example: Doctrine\Tests\ORM\Query\SelectSqlGenerationTest::testGroupBySupportsIdentificationVariable) 2013-09-30 11:08:42 +02:00
Diego Mazzaro
bd0e0c3fcf [bugfix] if BIGINT or SMALLINT version field was not incremented. 
Made version field accepted type coherent between ClassMetadataInfo and BasicEntityPersister
 2013-09-29 16:17:10 +02:00
Marco Pivetta
1414cc315e Merge pull request #803 from cleentfaar/patch-1 
Appended newline to (newly) generated files for PSR2 compatibility
 2013-09-28 10:46:09 -07:00
Cas
1fda797c8f Appended newline to (newly) generated files for PSR2 compatibility 
Appended newline to (newly) generated files for PSR2 compatibility
Additionally, slightly improved styling of concatenating return value
 2013-09-28 17:47:35 +02:00
Benjamin Eberlei
008187982d Merge pull request #792 from FabioBatSilva/DDC-2668 
[DDC-2668] Fix trim leading zero string
 2013-09-26 14:23:07 -07:00
Benjamin Eberlei
b7cffbde37 Merge pull request #802 from fasmide/patch-1 
Respect unsigned fields when tables get converted to entities.
 2013-09-26 14:12:24 -07:00
Kristian Mide
0326731348 Respect unsigned fields when tables get converted to entities. 
This is working on our mysql setup, however i have no idea of the consequences of this change when using other RDBMSes.
 2013-09-26 14:41:06 +02:00
flip111
76fda9562c Update SqlWalker.php fixed wrong GROUP BY clause on SQL Server platform 
Without this patch a query would like like:
```
SELECT c0_.Country AS sclr0
FROM Continent c0_ WITH (NOLOCK)
WHERE c0_.Country = 38
GROUP BY sclr0
```
Using the column alias in the GROUP BY clause. However this is not allowed on SQL Server. References:
1. http://stackoverflow.com/a/3841804
2. http://technet.microsoft.com/en-us/library/ms189499.aspx (Logical Processing Order of the SELECT statement)

The correct query should be:
```
SELECT c0_.Country AS sclr0
FROM Continent c0_ WITH (NOLOCK)
WHERE c0_.Country = 38
GROUP BY c0_.Country
```
 2013-09-26 14:11:56 +02:00
Guilherme Blanco
bd7c7ebaf3 Merge pull request #799 from FabioBatSilva/leftover-test 
remove unused test case
 2013-09-23 18:10:22 -07:00
Fabio B. Silva
614eed7f86 remove unused test case 2013-09-23 19:29:50 -04:00
Marco Pivetta
2089df36e3 Merge pull request #795 from sabzeta/patch-1 
Update query-builder.rst
 2013-09-20 11:05:38 -07:00
sabzeta
a419c7c93b Update query-builder.rst 
expresion substr changed to substring as of
http://www.doctrine-project.org/jira/browse/DDC-382
 2013-09-20 15:27:05 +03:00
flip111
a18aba1bb6 Improved error messages in Paginator: LimitSubqueryOutputWalker 
The already existing follow-up check throwing "Not all identifier properties can be found in the ResultSetMapping: %s" is a much more technical description.

If $sqlIdentifier is empty (count 0) it can be concluded that there are no mapped results. An alternative error message could thus be "The Paginator does not support queries without mapped results." (line 153).

Possibly '!=' on line 154 could be replaced by '>' because i think this is the only situation that can occur. But since i don't know this for sure, i left it like i found it.

Didn't use elseif in this commit as per Stof his suggestion.
 2013-09-17 21:01:09 +02:00