Jonathan H. Wage
b9965bfb1c
Merge branch 'master' of github.com:doctrine/doctrine2
2010-05-25 18:11:52 -04:00
Jonathan H. Wage
adcdefdf84
Fixing typo.
2010-05-25 16:17:37 -04:00
David Abdemoulaie
93701e6736
Updating gitignore to properly ignore Common and DBAL
2010-05-25 15:13:01 -05:00
David Abdemoulaie
dd21c54824
Merge branch 'DDC-612'
...
* DDC-612:
Third parameter to Expr::substring is now optional
2010-05-25 15:12:12 -05:00
David Abdemoulaie
ece0e3ad88
Third parameter to Expr::substring is now optional
2010-05-25 15:11:35 -05:00
Jonathan H. Wage
4934c49537
Merge branch 'master' of github.com:doctrine/doctrine2
2010-05-25 15:52:39 -04:00
Jonathan H. Wage
642c863bd3
Fixing build to place package.xml at root of package.
2010-05-25 15:52:13 -04:00
David Abdemoulaie
de30ce5922
Merge branch 'DDC-610'
...
* DDC-610:
Query\Expr::_quoteLiteral properly quotes numeric strings
2010-05-25 13:42:05 -05:00
David Abdemoulaie
b6a5402bcb
Query\Expr::_quoteLiteral properly quotes numeric strings
2010-05-25 13:41:02 -05:00
Jonathan H. Wage
2db8ad30a9
Fixing DatabaseDriverTest fails for mysql.
2010-05-25 13:35:12 -04:00
Jonathan H. Wage
e8386eca37
Cleanup after move.
2010-05-25 11:49:33 -04:00
Jonathan H. Wage
4f8fc24226
Fixing TestInit to work with submodules.
2010-05-25 11:42:09 -04:00
Jonathan H. Wage
b733a627b7
Added submodules.
2010-05-25 11:39:30 -04:00
Jonathan H. Wage
5da045fcc9
Adding submodules.
2010-05-25 11:35:12 -04:00
beberlei
e4c7fa961e
Removed Common and DBAL tests from repository, they are now in their respective projects
...
Removed Common and DBAL tests from repository, they are now in their respective projects
2010-05-23 19:19:48 +02:00
Christian Heinrich
45ec58fc7e
Updated message and added behaviour for public static vars
...
Signed-off-by: David Abdemoulaie <dave@hobodave.com>
2010-05-23 09:59:12 -05:00
Christian Heinrich
773f56bef2
Fixed #DDC-597
...
Added a test on public properties in entities. I did not check whether these properties are actually mapped to a column because personally, I believe that within an entity, there should only be protected / private members.
Signed-off-by: David Abdemoulaie <dave@hobodave.com>
2010-05-23 09:59:12 -05:00
Roman S. Borschel
aafb278aa2
Merge branch 'DDC-531'
2010-05-23 15:26:13 +02:00
Roman S. Borschel
64583c7e4c
Removed dependencies from repository.
2010-05-23 13:29:37 +02:00
Roman S. Borschel
3f16566b70
Added .gitignore
2010-05-23 13:08:29 +02:00
Roman S. Borschel
e1e51b81bd
Adjusted dependency paths.
2010-05-23 01:15:53 +02:00
Roman S. Borschel
366c129e75
Depdendency management and build updates.
2010-05-23 01:12:07 +02: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
Christian Heinrich
64309398e2
Merge commit 'upstream/master'
2010-05-20 14:41:56 +02: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
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
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
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
