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

4818 Commits

Author SHA1 Message Date
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
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
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
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
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
Christian Heinrich
b63afb6ce4 Fixed #DDC-580 2010-05-10 16:41:42 +02:00
Christian Heinrich
c2d2e45859 Fixed #DDC-578
Also added a new testcase
2010-05-10 16:17:17 +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
Christian Heinrich
dc3844e167 Fixed #DDC-571 2010-05-08 14:29:43 +02:00
Roman S. Borschel
ee04b31da3 Included new PostgreSQL IDENTITY/SERIAL test in functional suite. 2010-05-08 14:20:44 +02:00
Roman S. Borschel
561236bd56 [DDC-576] Fixed. 2010-05-08 14:08:18 +02:00
Christian Heinrich
4bf3058ab5 Fixed #DDC-571 2010-05-08 00:59:21 +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
Guilherme Blanco
b12b8b0041 Revertd partially the support to DBAL\Transaction, it was wrong. Fixed implementation of ORM\EntityTransaction and fixed tests. 2010-05-06 18:39:19 -03:00
Christian Heinrich
02e582e00e Merge branch 'master' of git://github.com/doctrine/doctrine2 2010-05-06 20:44:29 +02:00
Jonathan H. Wage
3001d26ad4 Fixing typo/mistake. Test coming soon. 2010-05-05 15:14:48 -04:00
Christian Heinrich
e50f77a780 Corrected method names; the interface already used SQL, the files still used Sql in method names 2010-05-05 13:12:38 +02:00
Benjamin Eberlei
c3303881a9 Fixed IBM DB2 Platform to support locking 2010-05-02 13:18:47 +02:00
Benjamin Eberlei
b8402c9563 Added Gearman Lock Test and Worker, verified lockings indeed works on MySQL, PostgreSQL and Oracle 2010-05-02 13:04:25 +02:00
Benjamin Eberlei
f65a555d04 Merge Upstream into Locking-Branch 2010-05-02 13:02:44 +02:00
Guilherme Blanco
4ab5dffc4c Fixed UnitOfWork and isRollbackOnly flag. 2010-05-01 11:49:14 -03:00
Roman S. Borschel
a9d88146f1 Merge commit 'upstream/master' 2010-05-01 16:06:16 +02:00
Benjamin Eberlei
302409dba4 Fixed Error due to merging tests/Doctrine/Tests/TestInit.php file 2010-05-01 13:51:29 +02:00
Roman S. Borschel
3899888a0c Merge commit 'upstream/master' 2010-05-01 12:17:03 +02:00
Roman S. Borschel
080f737338 [DDC-534] Fixed. 2010-05-01 12:14:16 +02:00
Benjamin Eberlei
9277dba383 Cleanup in DB2 Platform and SchemaManager 2010-05-01 04:31:10 +02:00
Benjamin Eberlei
604ed962e5 Merged Master into IBM DB2 branch 2010-05-01 04:07:32 +02:00
Benjamin Eberlei
427d4eed29 DDC-541 - Schema Table now return Pk, then Fk, then normal columns in that order 2010-05-01 03:57:58 +02:00
Benjamin Eberlei
987fbee758 DDC-537 Add missing sequence-generator tag definition in doctrine-mapping.xsd 2010-05-01 03:33:13 +02:00