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

8213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Peter Kokot
dca09148ca CS fixes 2013-09-22 02:12:30 +02: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
flip111
b803f06c8f 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.
 2013-09-17 15:07:08 +02:00
Fabio B. Silva
689da2f36b [DDC-2668] Fix trim leading zero string 2013-09-16 21:36:19 -04:00
Matthieu Napoli
6f538c509c Implemented "contains" operator for Criteria expressions 2013-09-16 14:56:04 +02:00
Benjamin Eberlei
fe78977973 Merge pull request #790 from javer/hhvm-func_get_args 
HHVM compatibility: func_get_args
 2013-09-15 11:05:01 -07:00
javer
64a0161935 HHVM compatibility: func_get_args 
All func_get_args() calls have been moved to the top of the methods
because HHVM doesn't keep a copy of the original args for performance
reasons.

See facebook/hiphop-php#1027 for details.
 2013-09-15 20:57:30 +03:00
flip111
67dd32d9fb A nicer way of detecting the platform 
Inspired by https://github.com/doctrine/doctrine2/blob/master/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php#L188
 2013-09-13 16:35:34 +02:00
flip111
e49a673a01 Update DatabaseDriverTest.php 
SQL Server does not support unsigned integers
 2013-09-13 16:29:31 +02:00
flip111
a190dad0b1 Update DDC719Test.php to be compatible with MsSQL 
Apparently Doctrine adds "with (nolock)" now for the mssql platform, but the test has not been updated yet.
 2013-09-13 15:11:35 +02:00
Marco Pivetta
c72698a997 Merge pull request #786 from weaverryan/patch-1 
Minor updates while reading the basic-mapping page
 2013-09-12 19:11:37 -07:00
Ryan Weaver
1fcef3321e Changes thanks to @Ocramius 2013-09-12 20:52:12 -05:00
Ryan Weaver
36d7d60c3b Minor updates while reading the basic-mapping page 
The only arguable changes involve a few spots where I either removed something I thought was too technical and not valuable (e.g. talking about the metadata mapping pattern).
 2013-09-12 17:08:48 -05:00
Benjamin Eberlei
067ed7b1c6 Fix master dependening on DBAL 2.5-dev 2013-09-12 08:00:08 +02:00
Benjamin Eberlei
b6e624b6bf Delete some very old, leftover code. 2013-09-11 22:43:38 +02:00
Marco Pivetta
237c1e24e6 Merge pull request #785 from Hawkeye0203/patch-1 
Update dql-custom-walkers.rst
 2013-09-11 07:32:58 -07:00
Daniel VanMullen
ef722066e3 Update dql-custom-walkers.rst 
Fixed typo of "customer" to "custom"
 2013-09-11 09:25:52 -04:00
Marco Pivetta
bb7f18ced7 Merge pull request #784 from eventhorizonpl/fix_docs 
fix documentation warnings p1
 2013-09-10 15:54:40 -07:00
Michal Piotrowski
bc37ceb58b fix warnings p1 
fix warnings p2

fix warnings p3

fix warnings p4
 2013-09-10 23:57:41 +02:00
Benjamin Eberlei
9983fcbac3 Fix some more details in basic-mapping.rst 2013-09-10 23:15:43 +02:00
Benjamin Eberlei
a948cb49b8 Small fixes in basic-mapping.rst 2013-09-10 22:36:03 +02:00
Benjamin Eberlei
546c817f64 Move Custom Mapping Types into cookbook, restructure the chapter more. 2013-09-10 22:09:22 +02:00
Benjamin Eberlei
caf6ba65e8 Refactor Basic Mapping chapter to focus on the actual topic more. Rearrange apperance of topics. Introduce a sane example entity as example. 2013-09-10 22:09:22 +02:00