RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-15 23:56:02 +03:00
Code Issues Projects Releases Wiki Activity
5,935 Commits 5 Branches 0 Tags 32 MiB
b6d776f75d
Commit Graph

5935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Eberlei
0cd0ae49a1 Fix regression introduced with DDC-1203,DDC-1204 patch 2011-06-16 23:00:59 +02:00
Benjamin Eberlei
713f4654fd Merge remote-tracking branch 'origin/master' 2011-06-16 22:49:29 +02:00
Benjamin Eberlei
22bdb1520a Merge branch 'DDC-1172' 2011-06-16 22:34:16 +02:00
Benjamin Eberlei
42c5382a03 DDC-1172 - Handle sequence dropping in SchemaTool. 2011-06-16 22:34:04 +02:00
Guilherme Blanco
98bc3c4e40 Merge pull request #74 from mridgway/DDC-1209 
[DDC-1209] Fixed custom object types as @Id
 2011-06-16 07:15:40 -07:00
Michael Ridgway
d1106a730b Made DDC-1209 test pass 2011-06-16 08:55:09 -04:00
Michael Ridgway
da2d83fc7d DDC-1209 tests 2011-06-15 17:15:46 -04:00
Benjamin Eberlei
ec748b2a16 Merge branch 'DDC-1203' 2011-06-15 22:27:32 +02:00
Benjamin Eberlei
5ff44b5ec7 DDC-1203, DDC-1204 - Fix problems with mapped superclasses in midth of inheritance hierachy and entities not mapped in discriminator map. 2011-06-15 22:27:24 +02:00
Benjamin Eberlei
dd329c903d Merge branch 'DDC-1208' 2011-06-15 18:32:06 +02:00
Benjamin Eberlei
3be6218341 DDC-1208 - Allow namespace separator in <discriminator-mapping /> 2011-06-15 18:31:59 +02:00
Benjamin Eberlei
71082bdba8 Merge branch 'master' of github.com:doctrine/doctrine2 2011-06-15 18:29:01 +02:00
Benjamin Eberlei
866534334f Merge pull request #71 from fabpot/master 
Updated Symfony2 vendors
 2011-06-14 08:08:16 -07:00
Fabien Potencier
b37c8f6a23 Update Symfony2 vendors 2011-06-14 17:01:33 +02:00
Benjamin Eberlei
df500033bf Merge pull request #70 from pkruithof/patch-1 
Change attribute 'columns' of type 'index' to 'xs:string'
 2011-06-14 06:27:07 -07:00
Peter Kruithof
05bf8477a3 The columns attribute of the index type was xs:NMTOKENS, therefore not allowing a comma, which is needed when multiple columns need to be specified. (I've checked the XmlDriver code for this) 
It should be the same as the `columns` attribute of the `unique-constraints` type, namely `xs:string`.
 2011-06-14 02:36:49 -07:00
Benjamin Eberlei
2b52eff4eb Merge branch 'master' of github.com:doctrine/doctrine2 2011-06-13 08:54:39 +02:00
Benjamin Eberlei
d5daf161c6 Merge pull request #64 from mvrhov/schema_extension 
Add extension points into the xml schema
 2011-06-12 13:14:19 -07:00
Benjamin Eberlei
12dfb5ee38 Merge pull request #67 from Nico-B/master 
joinTable error with DB to YML generator
 2011-06-12 13:09:32 -07:00
Benjamin Eberlei
39ee9e5e5b Merge pull request #69 from Garfield-fr/master 
Renamed function getFullName with getName
 2011-06-12 13:08:43 -07:00
Bertrand Zuchuat
c7eaf77d15 Renamed function getFullName with getName to match with last change on Symfony Console 2011-06-12 14:46:02 +02:00
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