Roman S. Borschel
5d00fb764b
[DDC-622] Fixed.
2010-06-07 13:10:15 +02:00
Roman S. Borschel
1303aea00e
Merge branch 'DDC-599'
2010-06-07 13:03:39 +02:00
Roman S. Borschel
a90ad24cca
Fixed order in testcase.
2010-06-07 13:02:29 +02:00
Roman S. Borschel
37b4652639
[DDC-599] Fixed.
2010-06-07 00:31:59 +02:00
Roman S. Borschel
4a9369de9e
Fixed incorrect transaction management in locking tests.
2010-06-07 00:15:38 +02:00
Benjamin Eberlei
35e49aaf9f
Fixed a fatal error in DatabasePlatformMock when linking ORM against latest DBAL, added a phpunit configuration.xml to change dependencies for tests
2010-06-06 22:41:05 +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
42e83c4de6
Removing phing dependency resolving as it is done with submodules now.
2010-05-26 11:56:43 -04:00
Jonathan H. Wage
43df6eb989
Fixing ORM version.
2010-05-26 11:47:01 -04:00
Jonathan H. Wage
113097ffd0
Trying new way to generate pear packages.
2010-05-25 23:15:16 -04:00
Jonathan H. Wage
2a24f889dc
Fixing phing building and cli for pear install.
2010-05-25 20:00:17 -04:00
Jonathan H. Wage
f54dce93aa
Fixing failing test introduced in last commit.
2010-05-25 18:22:42 -04:00
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
