NicoB
524c799e37
Merge remote-tracking branch 'remotes/upstream/master'
2011-06-11 17:56:50 +07:00
Benjamin Eberlei
fe527fbf1a
Merge pull request #59 from asm89/databasedriver-patch
...
Implemented tableName -> className and columnName -> fieldName mapping in DatabaseDriver.
2011-06-11 03:15:16 -07:00
Benjamin Eberlei
037daff891
Merge pull request #65 from weaverryan/update_command
...
[Tools][Console] Refactoring the UpdateCommand
2011-06-11 01:16:25 -07:00
Benjamin Eberlei
9945296472
Merge pull request #61 from stof/EntityGenerator_3
...
Updated the EntityGenerator to be compatible with Common 3.0.x
2011-06-11 01:13:05 -07:00
Guilherme Blanco
fdbc909bde
Merge branch 'master' of github.com:doctrine/doctrine2
2011-06-09 15:43:37 -03:00
Guilherme Blanco
1f6b49d236
Added getRootEntities to QueryBuilder.
2011-06-09 15:42:40 -03:00
NicoB
3cdb4e007d
joinTable can be undefined because ManyToMAny generation is bidirectional with inverse sides
2011-06-07 18:55:52 +07:00
Benjamin Eberlei
a4cbb23fc8
Slight adjustment to build.xml
2011-06-05 17:21:37 +02:00
Benjamin Eberlei
97573425f9
Merge branch 'DDC-1163'
2011-06-05 16:21:35 +02:00
Benjamin Eberlei
4371e8fab0
DDC-1163 - Fix nasty bug with inheritance in UnitOfWork::executeUpdates() and executeRemovals()
2011-06-05 16:21:23 +02:00
Benjamin Eberlei
22826ac10d
DDC-1156 - Do not throw exception for mapped superclass in middle of inheritance hierachy anymore.
2011-06-05 15:00:49 +02:00
Benjamin Eberlei
543432bf53
Merge branch 'DDC-1192'
2011-06-05 14:50:05 +02:00
Benjamin Eberlei
d17d0f5452
DDC-1192 - Fix notice in XmlDriver, removed unnecessary code.
2011-06-05 14:49:54 +02:00
Benjamin Eberlei
d3ab9b51fa
DDC-1181 - Add test that verifies cascade remove works for entities with foreign identifiers
2011-06-05 13:57:44 +02:00
Benjamin Eberlei
ddb647f39f
DDC-1173 - Fix bug when calling UnitOfWork::clearEntityChangeSet() in listener
2011-06-05 13:34:07 +02:00
Benjamin Eberlei
70d756d59c
DDC-1184 - Improve error handling in AssignedIdGenerator
2011-06-05 12:54:29 +02:00
Benjamin Eberlei
f3677554e8
Merge branch 'master' of github.com:doctrine/doctrine2
2011-06-05 12:52:05 +02:00
Benjamin Eberlei
3cdff65761
Merge pull request #63 from chesteroni/master
...
Added missing checks for associatation indexes
2011-06-05 03:28:52 -07:00
Benjamin Eberlei
ff30f86082
Merge pull request #62 from mvrhov/yml_export_notice_fix
...
Fixing Notice: Undefined index in yaml export driver
2011-06-05 03:28:31 -07:00
Benjamin Eberlei
1038a866a4
DDC-1194 - Improve error handling for DQL INSTANCE OF
2011-06-05 10:48:21 +02:00
Benjamin Eberlei
2c9a12771b
Merge branch 'DDC-1193'
2011-06-05 10:03:04 +02:00
Benjamin Eberlei
bda4165bf8
DDC-1193 - Fix previous commit.
2011-06-05 10:02:57 +02:00
Benjamin Eberlei
84aefd6340
Merge branch 'DDC-1193'
2011-06-05 09:59:57 +02:00
Benjamin Eberlei
acaf08d4b7
DDC-1193 - Fix bug with cascade remove and proxy classes.
2011-06-05 09:59:16 +02:00
Benjamin Eberlei
875912bffd
DDC-733 - Add UnitOfWork::initializeObject() method.
2011-06-05 08:44:38 +02:00
Fabien Potencier
86c3744b8c
Made orm:convert-mapping command more configurable (allow to change the extension of the generated files for instance)
2011-06-05 08:23:08 +02:00
Benjamin Eberlei
875f5c1fa8
Merge branch 'master' of github.com:doctrine/doctrine2
2011-06-05 08:19:25 +02:00
Ryan Weaver
6468740915
[Tools][Console] Reworking changes to be more backwards compatible
...
This keeps the --dump-sql and --force options, but adds an exception if you try to use them both (which previously, only dumped the SQL but didn't tell you that it was *not* in fact also executing the queries).
One additional change is the introduction of a `$name` property, which was the only way that a parent task could allow a child task to override the task's name early enough that the task's overridden name is taken to account when the parent class references it for its help message.
2011-06-03 15:09:18 -05:00
Ryan Weaver
79643e32ed
[Tools][Console] Refactoring the UpdateCommand
...
There are two basic changes:
1) Changed --force and --dump-sql from options to a single argument. Prior, you couldn't pass both options simultaneously anyways, so making them an argument is more accurate.
2) Changed the language and formatting of the task to be more user-friendly.
2011-06-03 08:02:51 -05:00
Alexander
7ee8dc4e44
DDC-1179 - Make it possible to specify a namespace when mapping with --from-database
2011-06-02 21:45:03 +02:00
chesteroni
23540c17f1
Added checking for existing indexes in associatation mapping array.
2011-05-28 20:57:19 -07:00
Miha Vrhovnik
bb873826ca
Fixing Notice: Undefined index: orderBy in ...Doctrine/ORM/Tools/Export/Driver/YamlExporter
2011-05-27 08:43:29 +02:00
Guilherme Blanco
93521217a6
Moved getQuoted* from ClassMetadata to ClassMetadataInfo, since SchemaTool relies on them, making impossible to work with DisconnectedClassMetadataFactory.
2011-05-26 02:18:29 -03:00
Christophe Coevoet
693fc090b5
Updated the EntityGenerator to be compatible with Common 3.0.x
2011-05-25 12:35:54 +02:00
Benjamin Eberlei
ca6ea65b1f
Merge branch 'NewAnnotations'
2011-05-25 00:36:10 +02:00
Benjamin Eberlei
3adbf0de39
Add forward compatibility with Doctrine Common 3.0
2011-05-25 00:35:57 +02:00
Johannes Schmitt
a0d79b03e7
[AnnotationDriver] compatibility with Doctrine Common 3.x
2011-05-25 00:32:55 +02:00
Benjamin Eberlei
2b3d0a209c
Merge branch 'NewAnnotations'
2011-05-25 00:26:29 +02:00
Benjamin Eberlei
6d724ad9ff
Make ORM forward compatible with new Doctrine Annotations library version 2.1
2011-05-25 00:26:20 +02:00
Benjamin Eberlei
0bb0937372
Started UPGRADE_TO_2_1 document
2011-05-20 21:13:25 +02:00
Alexander
cec62db2d8
Removed _ prefix from private functions.
2011-05-20 16:53:35 +02:00
Alexander
262ae7c942
Implemented tableName -> className and columnName -> fieldName mapping in
...
DatabaseDriver.
2011-05-20 16:36:43 +02:00
Benjamin Eberlei
85fb1a3ebb
Merge branch 'master' of github.com:doctrine/doctrine2
2011-05-18 19:37:32 +02:00
Benjamin Eberlei
a979852ee6
Merge branch 'DDC-1080'
2011-05-17 23:42:39 +02:00
Benjamin Eberlei
9ea03de84f
DDC-1080 - Fix bug with hydration of derived entities/foreign key as primary key.
2011-05-17 23:42:24 +02:00
Benjamin Eberlei
9f01e9563f
Bump Dev Version to 2.1.0BETA2-DEV
2011-05-16 19:35:00 +00:00
Benjamin Eberlei
f4021e7469
Update Doctrine Common to latest version and add new methods to ClassMetadataInfo
2011-05-16 20:42:38 +02:00
Benjamin Eberlei
5d81e867be
Add some logic to keep backwards compatibility in QueryBuilder
2011-05-15 23:16:44 +02:00
Benjamin Eberlei
85d40847ac
Reintroduce QueryBuilder::getRootAlias() for backwards compatibility reasons, mark as @deprecated
2011-05-15 22:11:10 +02:00
Benjamin Eberlei
5e938b3147
Revert "Implemented auto-inference of isCascadeRemove when orphanRemoval is defined (marked as todo)."
...
This reverts commit 551247d11a
.
2011-05-15 20:39:55 +02:00