RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-13 04:07:09 +03:00
Code Issues Projects Releases Wiki Activity
8,135 Commits 5 Branches 0 Tags 32 MiB
514dd4e852
Commit Graph

8135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Heinrich
64309398e2 Merge commit 'upstream/master' 2010-05-20 14:41:56 +02:00
Jonathan H. Wage
10b676aa2b Merge commit '5c79ca25aabaf574d71d6bc622c13fd6045626d2' 2010-05-20 08:35:02 -04:00
Christian Heinrich
3fc9971e98 Merge commit 'upstream/master' 
Conflicts:
	lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
 2010-05-20 14:17:39 +02:00
David Abdemoulaie
5bbe6c7292 Revert "Adding missing OnFlush annotation." 
This reverts commit 79d3f655ef.
 2010-05-18 17:20:40 -05:00
David Abdemoulaie
dbeaa3f548 Merge remote branch 'jwage/master' 
* jwage/master:
  Adding missing OnFlush annotation.
 2010-05-18 17:06:38 -05:00
Roman S. Borschel
e88aaa1b3b Merge branch 'DDC-505' 2010-05-18 23:34:48 +02:00
Roman S. Borschel
a45560dbd0 [DDC-505] Fixed and small lexer simplifcations that were marked as todo. 2010-05-18 22:19:08 +02:00
Jonathan H. Wage
79d3f655ef Adding missing OnFlush annotation. 2010-05-18 13:19:15 -04:00
Jonathan H. Wage
0698a8c455 Fixing php code 2010-05-18 11:51:49 -04:00
Jonathan H. Wage
1193c530c9 Merge branch 'master' of github.com:doctrine/orm-documentation 2010-05-18 11:50:18 -04:00
Jonathan H. Wage
18b9c6cd69 Updating documentation for converting mapping information and reverse engineering databases to entities. 2010-05-18 11:49:44 -04:00
Roman S. Borschel
3cbee1fa09 Merge commit 'upstream/master' 2010-05-16 13:30:48 +02:00
Roman S. Borschel
3045507a9b [DDC-593] Fixed. 2010-05-16 13:30:40 +02:00
Benjamin Eberlei
9231f54313 DDC-153 - Added cookbook entry contributed by merk (thanks!) 2010-05-16 09:50:07 +02:00
Benjamin Eberlei
d098d62e1e DDC-527 - Fixed bug in OCI8 Driver 2010-05-15 23:07:00 +02:00
Benjamin Eberlei
1067118174 DDC-568 - Fix bug with hints not being passed to hydrator by AbstractQuery::iterate() 2010-05-15 21:52:59 +02:00
Benjamin Eberlei
ba6cb6bd14 Fixed nasty bug with Proxies not getting initialized correctly. 2010-05-15 21:32:34 +02:00
Benjamin Eberlei
74df4c39dc DDC-592 - Fix Validator notices when mappedBy or inversedBy properties dont exist 2010-05-15 20:54:22 +02:00
Benjamin Eberlei
46684ea5c9 Added a bunch of functional tests for the public read, write and transactional public DBAL API, passing all the current drivers 
Added a Write Test
 2010-05-15 19:54:56 +02:00
Benjamin Eberlei
dbb5795c53 DDC-178 Removed Doctrine\ORM\LockMode 2010-05-15 12:04:46 +02:00
Benjamin Eberlei
ad402c6ded DDC-178 DQL Optimistic Lock now requires ALL classes to be versioned, otherwise throws exception 2010-05-15 11:53:28 +02:00
Benjamin Eberlei
10312494f1 Merge branch 'DDC-178' into develop 2010-05-15 11:50:51 +02:00
Benjamin Eberlei
78328ec6ea DDC-178 - Removed Doctrine\ORM\LockMode in favour of Doctrine\DBAL\LockMode 2010-05-15 11:48:20 +02:00
Benjamin Eberlei
72c2432586 DDC-590 - Added docs on Locking Support 2010-05-15 11:27:49 +02:00
Benjamin Eberlei
e958396450 Merge branch 'master' into develop 2010-05-15 10:15:21 +02:00
Benjamin Eberlei
28b03077b8 Merge branch 'lock-support' 2010-05-15 09:59:14 +02:00
Benjamin Eberlei
8a67621b6a DDC-178 - Fixed problems occuring from merging upstream, re-ran API and tests, finalizing lock-support for merge with upstream 2010-05-15 09:58:39 +02:00
Benjamin Eberlei
64b57bbcfb Merge upstream into lock-support branch 2010-05-15 09:41:32 +02:00
Christian Heinrich
5c79ca25aa Updated formatting and fixed mistakes 2010-05-15 00:40:18 +02:00
Roman S. Borschel
3b01277fd4 Merge commit 'upstream/master' 2010-05-14 22:11:47 +02:00
David Abdemoulaie
668456e4d8 [DDC-588] EntityManager::refresh uses fieldName instead of columnName 2010-05-14 22:10:13 +02:00
Jonathan H. Wage
73ff99c053 Merge remote branch 'hobodave/DDC-588' 2010-05-14 15:53:18 -04:00
Jonathan H. Wage
29c8f1715f Merge remote branch 'upstream/master' 2010-05-14 15:43:15 -04:00
David Abdemoulaie
edf096eb57 [DDC-588] EntityManager::refresh uses fieldName instead of columnName 2010-05-14 14:38:47 -05:00
Jonathan H. Wage
a59b62e3ba Merge remote branch 'mridgway/master' 2010-05-14 15:26:28 -04:00
Jonathan H. Wage
f99a096d01 Adding a little more information to the dql chapter. 2010-05-14 15:23:51 -04:00
Roman S. Borschel
8174f67a69 Fixed DataAccessTest to be included in AllTests. 2010-05-14 20:38:35 +02:00
Roman S. Borschel
ad9d678701 Removing API docs from repo, now that we have them online. Merged fetchRow fix from hobodave. 2010-05-14 20:33:42 +02:00
Michael Ridgway
a3b42392b4 Fixed broken reference to DBAL section 2010-05-14 11:32:12 -07:00
Roman S. Borschel
cd095d9f97 updated API docs 2010-05-14 20:25:37 +02:00
Jonathan H. Wage
5a92c0b51e Fixing issue with reverse engineering databases. 2010-05-14 12:38:42 -04:00
Jonathan H. Wage
464accecfe Fixing wrong variable name. 2010-05-14 12:33:17 -04:00
Jonathan H. Wage
7ac08931bc Fixing DatabaseDriver to specify nullable => true instead of notnull => false 2010-05-14 12:31:25 -04:00
Jonathan H. Wage
5a79963bd2 Removing dbal documentation from orm docs 2010-05-14 11:12:54 -04:00
Roman S. Borschel
5dbd40563c Added control abstractions for transaction demarcation. 2010-05-13 13:19:59 +02:00
Roman S. Borschel
184a402f39 Fixed typo 2010-05-13 13:14:37 +02:00
Roman S. Borschel
7d79777bfb Merge commit 'origin/master' 2010-05-13 13:06:20 +02:00
Roman S. Borschel
84c1d34028 Added documentation about control abstractions for transaction handling. 2010-05-13 13:06:16 +02:00
Christian Heinrich
21bbbb1f1f Updated query builder docs 2010-05-13 00:58:17 +02:00
Benjamin Eberlei
177a9ce4d2 Update Getting Started XML Edition to work with inversed-by attributes 2010-05-12 23:53:09 +02:00