1
0
mirror of synced 2024-12-14 07:06:04 +03:00
Commit Graph

790 Commits

Author SHA1 Message Date
Benjamin Eberlei
190d115dce DDC-616 - Fix a regression with many-to-many tables introduced with the DDC-627 commit 2010-06-13 23:02:18 +02:00
Benjamin Eberlei
7c2fac64fb Merge branch 'master' of github.com:doctrine/doctrine2 2010-06-13 20:14:03 +02:00
Benjamin Eberlei
c69b2d2b54 Merge branch 'DDC-627' 2010-06-13 20:10:10 +02:00
Benjamin Eberlei
434325ed4f Fixed DDC-557 - Default allocation size for sequences changed from 10 to 1. Documented in UPGRADE file 2010-06-13 20:09:59 +02:00
Roman S. Borschel
c8e20aa217 Bumping dev version. 2010-06-13 19:56:43 +02:00
Benjamin Eberlei
b7db8df7ef Fixed DDC-627 and DDC-616 2010-06-13 19:36:49 +02:00
Roman S. Borschel
d6cb87a0ac [DDC-604] Fixed. 2010-06-07 13:57:43 +02:00
Roman S. Borschel
5d00fb764b [DDC-622] Fixed. 2010-06-07 13:10:15 +02:00
Roman S. Borschel
37b4652639 [DDC-599] Fixed. 2010-06-07 00:31:59 +02:00
Jonathan H. Wage
bf9f7f85af Tweaking the method names of the recently added feature which allows custom hydration modes. 2010-06-03 14:11:31 -04:00
Jonathan H. Wage
5b148c7b20 [DDC-161] Adding ability to use custom hydrators with queries. 2010-06-02 23:25:09 -04:00
Jonathan H. Wage
43df6eb989 Fixing ORM version. 2010-05-26 11:47:01 -04:00
David Abdemoulaie
ece0e3ad88 Third parameter to Expr::substring is now optional 2010-05-25 15:11:35 -05:00
David Abdemoulaie
b6a5402bcb Query\Expr::_quoteLiteral properly quotes numeric strings 2010-05-25 13:41:02 -05:00
Roman S. Borschel
616f2eda0a [DDC-531] Fixed. 2010-05-21 11:49:05 +02:00
Jonathan H. Wage
35f66ab4ed Merge remote branch 'upstream/master' 2010-05-20 09:02:31 -04:00
Jonathan H. Wage
2d7f7691e9 [DDC-603] Fixing issue with reverse engineering a database where table names are all caps 2010-05-20 09:01:34 -04: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
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
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
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
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
78328ec6ea DDC-178 - Removed Doctrine\ORM\LockMode in favour of Doctrine\DBAL\LockMode 2010-05-15 11:48:20 +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
Jonathan H. Wage
73ff99c053 Merge remote branch 'hobodave/DDC-588' 2010-05-14 15:53:18 -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
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
Roman S. Borschel
5dbd40563c Added control abstractions for transaction demarcation. 2010-05-13 13:19:59 +02:00
Benjamin Eberlei
e62b51cf38 DDC-515 - Deleted obsolte SchemaValidatorCommand (we already had a ValidatorSchemaCommand) 2010-05-12 23:42:48 +02:00
Benjamin Eberlei
d9969901e1 DDC-515 - Fixed some issues with Schema Validation Command 2010-05-12 23:41:28 +02:00
Benjamin Eberlei
57cd2e01bb DDC-515 - Fixed a notice occuring in certain scenarios of the new Validate Schema Tool 2010-05-11 23:12:26 +02:00
Benjamin Eberlei
d00f674a08 DDC-515 - Enhanced Validate-Schema-Command, integrated it with CLI and besides mapping<->database checks also do consistency checks of the mapping files 2010-05-11 23:08:36 +02:00
Christian Heinrich
f2213c4d00 Fixed #DDC-578
Also added a new testcase
2010-05-11 11:19:38 +02:00
Roman S. Borschel
f9b53c6b5c Fixed #DDC-580
Conflicts:

	lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
2010-05-11 00:03:09 +02:00
Roman S. Borschel
f619a15a63 Removed EntityTransaction until it has a real purpose. Added the affected entity to OptimisticLockException. Updated functional optimistic locking tests accordingly. 2010-05-10 23:51:56 +02:00
Guilherme Blanco
d0325d7048 Merged with upstream/master 2010-05-08 12:42:06 -03:00
Roman S. Borschel
59d4e0c8e7 [DDC-481] Fixed. 2010-05-08 17:01:20 +02:00
Roman S. Borschel
561236bd56 [DDC-576] Fixed. 2010-05-08 14:08:18 +02:00
Christian Heinrich
20c6259fa3 Corrected method names; the interface already used SQL, the files still used Sql in method names 2010-05-07 13:44:22 +02:00
Roman S. Borschel
8d52967fcd Polished QueryBuilder API documentation and added another test. 2010-05-07 13:36:25 +02:00
Guilherme Blanco
65fbb9f7a4 Renamed fetchRow to fetchAssoc, as defined in @todo list. Renamed getRollbackOnly to isRollbackOnly, since it is more consistent to its purpose. 2010-05-06 18:45:18 -03:00