1
0
mirror of synced 2024-12-15 07:36:03 +03:00
Commit Graph

2578 Commits

Author SHA1 Message Date
romanb
15f84f6eb0 [2.0][DDC-187] Fixed. Also fixed some DBAL failures on postgres. 2009-12-03 13:17:56 +00:00
guilhermeblanco
73017b536f [2.0][DDC-180] Fixed SmallInt type which was missing to extends Type 2009-12-03 02:36:59 +00:00
beberlei
745b52b163 [2.0] DDC-169 - Fixed introduced bug in Oracle Platform 2009-12-02 22:33:01 +00:00
beberlei
197224de2e [2.0] DDC-169 - Changed AbstractPlatform and AbstractSchemaManager Constraint API to accept Constraint interface, which is implemented by indexes and foreign keys. 2009-12-02 22:28:38 +00:00
romanb
22375235db [2.0][DDC-162][DDC-94] Fixed. 2009-12-02 20:49:10 +00:00
romanb
69a0b597c8 [2.0][DDC-174] Fixed. 2009-12-02 20:32:41 +00:00
beberlei
25c9588592 [2.0] DDC-169 - Changed AbstractPlatform and AbstractSchemaManager and children to accept Sequences in their create and get sql methods. 2009-12-02 19:07:38 +00:00
beberlei
8562c80890 [2.0] DDC-169 - Changed AbstractPlatform and AbstractSchemaManager and children to accept Table, Index and ForeignKey instances for the respective create*() methods. 2009-12-02 18:52:21 +00:00
beberlei
e3314dae16 [2.0] DC-169 - New method AbstractSchemaManager::createSchema() which creates a schema instance with full tables and sequences, additionally listTables() was rewritten to return a full Table instance instead of just the table names. 2009-11-30 23:12:26 +00:00
beberlei
b7652f1f4e [2.0] Temporary fix for 186 2009-11-30 22:33:08 +00:00
beberlei
31be2519f6 [2.0] DDC-169 - Fix build, Postgres, Oracle and Sqlite made some minor troubles with regards to sequences. 2009-11-30 21:16:29 +00:00
beberlei
af48974a75 [2.0] DDC-169 - Converted introspection queries of all platforms to return Column, Sequence, Index, ForeignKey Schema Instances instead of arrays, heavily pimped Oracle support thereby. 2009-11-30 19:02:05 +00:00
beberlei
709dfb52c4 [2.0] DDC-169 - Finalized implementation of Schema diff algorithm, added diffs of sequences and foreign keys. Fixed several bugs and changed the API of the Schema objects. 2009-11-29 15:51:14 +00:00
beberlei
f22a56cdd7 [2.0] - DDC-169 - Fixed another regression in refactored SchemaTool, began porting of eZ Components Database Schema Comparator, SchemaDiff and TableDiff. 2009-11-28 14:30:08 +00:00
beberlei
e4a38a74c5 [2.0] - DDC-169 - Extracted Method for the generation of a Schema Instance from Doctrine Metadata. 2009-11-28 11:30:25 +00:00
beberlei
b21553c5a8 [2.0] - DDC-169 - Refactored lots of sections with duplicate code in gather relations part of SchemaTool::getCreateSql() 2009-11-28 11:17:31 +00:00
beberlei
2c27435bb2 [2.0] - DDC-169 - Completed refactoring of SchemaTool::getCreateSql() to use new DBAL Schema API, several internal optimizations in SchemaTool are now possible. Stripped out shared functionality with getUpdateSql() so that this part of SchemaTool is still completly working with the old API. 2009-11-28 10:48:51 +00:00
beberlei
ba01175700 [2.0] - DDC-169 - Fix for breaking the building of Single-Table Inheritence in SchemaTool 2009-11-28 08:59:29 +00:00
beberlei
44cc6465be [2.0] DDC-169 - Savepoint for Refactorings in Schema-Tool - It is now generating DDL according to the old and the new mechanisms in parallel. Equality of generation has been verified on Sqlite, Mysql, Oracle. If Postgres is also verified, the old code will be removed in favour of the new one completly. 2009-11-28 01:22:21 +00:00
beberlei
0902527476 [2.0] - DDC-169 - Added DropSchemaSql Visitor - Refactored Visitor package a bit, however its still not very appealing to have that much use statements cluttered in the code 2009-11-27 22:00:43 +00:00
beberlei
22cfa37f43 [2.0] - DDC-169 - Began refactoring of DBAL code, introduced object notation for a database schema, including Tables, Indexes, Constraints, Sequences and Columns. Added a CreateSql Visitor which transforms a schema object graph into the required SQL statements to create it. Next: Replacing SchemaTool::getCreateSql() with new syntax... 2009-11-26 21:56:08 +00:00
romanb
fdd9b05158 [2.0] Fix for optimistic locking. 2009-11-25 21:48:04 +00:00
guilhermeblanco
ba4d1bb393 Fix create/drop database against PgSQL. Thanks Hannes and Russ for patch 2009-11-25 16:27:18 +00:00
romanb
555b097641 [2.0][DDC-164][DDC-165] Fixed. Cleaned up ManyToManyMapping. Cleaned up identifier handling and handling of composite identifiers in some places. 2009-11-21 18:52:02 +00:00
beberlei
a9d739a743 [2.0] Refactor Exceptions from Query and AST\InputParameter into QueryException class. 2009-11-21 17:04:17 +00:00
beberlei
26a2ec2e63 DDC-127 - Special Case with invalid input parameter in DQL leads to php notice instead of an exception. 2009-11-21 13:18:45 +00:00
beberlei
f9ab947372 DDC-126 - Make Query, NativeQuery Fluent-Interfaces for all their set Methods, renamed setExpireQueryCache() and setExpireResultCache() to expireQueryCache() and expireResultCache(). Updated UPGRADE_TO_2_0 document accordingly. 2009-11-21 13:13:19 +00:00
beberlei
fc98f26371 DDC-127 - Commit missing changes to Query Error handling which make testsuite fail. 2009-11-21 12:33:30 +00:00
beberlei
3b9fd15dd6 DDC-154 - Commit patch by giorgiosironi which improves SchemaTool error messages. 2009-11-21 12:11:30 +00:00
beberlei
5930a7c42d DDC-127 - Enhance IterableResult by making it implement the Iterator interface, wrote a unit-test for this scenario, also added some additional tests for special cases in the query api that lead to exceptions. 2009-11-20 15:10:45 +00:00
romanb
32e608e5e2 [2.0][DDC-159] Fixed. 2009-11-19 17:35:14 +00:00
romanb
7db2f9abd9 [2.0] Fixed dirty state of lazy-initialized collection with new elements prior to initialization. 2009-11-19 13:29:55 +00:00
romanb
ba496fd3ad [2.0][DDC-158] Small correction to previous patch. Moved takeSnapshot up in order not lose new objects that were added before initialization. 2009-11-19 13:26:27 +00:00
romanb
61f09e335e [2.0][DDC-158] Fixed. Collections did not take snapshots after lazy initialization leading to wrong change sets. 2009-11-19 13:12:00 +00:00
jwage
220e30e519 [2.0] Fixing the IsolatedClassLoader to work with null ns 2009-11-17 03:38:35 +00:00
guilhermeblanco
50f727b58e [2.0] Major refactorings to CLI. New documentation applied. Missing validation and tests 2009-11-17 01:43:01 +00:00
guilhermeblanco
67665aa574 [2.0] Major refactorings to CLI. New documentation applied. Missing validation and tests 2009-11-17 01:29:20 +00:00
romanb
ea4f5c172a [2.0][DDC-149] Fixed. 2009-11-16 17:03:33 +00:00
romanb
124cbe9086 [2.0][DDC-137] Fixed. 2009-11-15 11:42:05 +00:00
romanb
c3ef019549 [2.0][DDC-145] Fixed. 2009-11-13 19:34:10 +00:00
romanb
94d771172e [2.0][DDC-74] Fixed. 2009-11-13 16:39:28 +00:00
romanb
3a282b1e9c [2.0][DDC-141] Fixed. 2009-11-13 10:11:14 +00:00
jwage
1a08dd2d90 [2.0][DDC-81] Fixes issue with wrong class names when using sub-namespaces 2009-11-11 21:18:09 +00:00
jwage
fdd1954a7b [2.0][DDC-72] Fixes issue with converting D1 column aliases to D2 field names 2009-11-11 21:15:27 +00:00
jwage
fa4046787e [2.0][DDC-66] Fixing mapping of D1 timestamp to D2 datetime 2009-11-11 20:46:49 +00:00
jwage
2a663bee05 [2.0][DDC-64] Fixing issue with converting D1 schema clob to D2 2009-11-11 20:44:14 +00:00
jwage
d047f0e25e [2.0][DDC-71] Fixing call to incorrect method name 2009-11-11 19:39:47 +00:00
jwage
1405993e6a [2.0][DDC-104] Making sure current code is cleared 2009-11-11 19:34:43 +00:00
romanb
ab0c7b11c8 [2.0][DDC-136] Some fixes to internal UnitOfWork logic. 2009-11-11 16:20:29 +00:00
romanb
57a97eba01 [2.0][DDC-120] First version of OCI8 driver. 2009-11-08 11:11:46 +00:00
romanb
8e3f6eee0a [2.0][DDC-121] Fixed. Also fixed memcache tests and some small refactorings. 2009-11-08 11:07:49 +00:00
romanb
7f725aa71c [2.0][DDC-121] Fixed unintended collection initialization in UnitOfWork. 2009-11-07 11:54:47 +00:00
beberlei
b24811e29a [2.0] Fix Fatal errors in unused classes that crash the testsuite when running PHPUnit with coverage-whitelisting of complete Doctrine directory. 2009-11-06 17:05:22 +00:00
beberlei
93b20427c9 [2.0] Fix Tab Formating in ParserResult class, added doc-comments and fixed a missing variable initialization error for certain query special cases. 2009-11-06 17:03:59 +00:00
beberlei
1dae2eaf41 [2.0] DDC-109 - Fixed another warning in SchemaTool with inverse join columns and unique constraints. 2009-11-06 14:15:58 +00:00
beberlei
30e2299321 [2.0] DDC-109 - Fixed warning in SchemaTool with inverse join columns and unique constraints. 2009-11-06 14:11:03 +00:00
romanb
10bc51fdcd [2.0][DDC-116] Fixed. 2009-11-06 10:28:37 +00:00
beberlei
7220cb2e8b DDC-118 - Fixed introduced regression and added tests for future 2009-11-05 18:55:02 +00:00
beberlei
3678b65186 [2.0] DDC-114 - Extend SchemaTool Drop functionality to optionally drop the complete database. Additionally a filter against all existing table is applied to avoid errors due to dropping non-existant tables. Updated Schema-Tool CLI command with optional calls --drop=database --drop=metadata but kept original --drop which defaults to "metadata". Updated documentation. 2009-11-05 08:47:56 +00:00
beberlei
884131e51f [2.0] DDC-115 - Proper fix of global namespace problem was in the ClassMetadataInfo, a namespace plus seperator was appended for reasons of shortcuts. However this broke associations in global namespace. Changes to ClassMetadataFactory were reverted and fix plus tests applied to ClassMetadataInfo. 2009-11-04 23:06:38 +00:00
beberlei
120e6942e8 [2.0] DDC-115 - Fix for multiple class metadata instances because of classes being addressed with or without prepending namespace separator. 2009-11-04 19:59:34 +00:00
beberlei
69ef16360f [2.0] DDC-112 - Enhance debugging capabilities in OrmFunctionalTestCase by logging all SQL queries and enrichting all test failures with them (PHPUnit 3.4 only feature). 2009-11-04 11:39:49 +00:00
guilhermeblanco
4a861f08a8 [2.0] More refactorings in Annotations parser and DQL parser. Now they only use constants instead of string processment 2009-11-04 01:52:40 +00:00
guilhermeblanco
e05ec39ff3 [2.0] Moved string tokens to be constants. No more string comparisons inside parser 2009-11-03 21:42:58 +00:00
beberlei
a72977b33d [2.0] DDC-109 - Add support for Unique Constraint in OneToMany unidirectional relations 2009-11-03 18:33:38 +00:00
romanb
7bbdac1c88 [2.0][DDC-61][DDC-108] Fixed. Started exception refactoring. 2009-11-03 18:30:21 +00:00
beberlei
460aeeb194 [2.0] Applied patch from DDC-76, LazyLoad AnnotationDriver in ORM Configuration. 2009-11-03 16:59:13 +00:00
beberlei
a7847952a1 [2.0] Fixed DDC-63 and DDC-106. Oracle tests for SchemaManager need further tweeking, marked as skipped for now. 2009-11-03 16:56:05 +00:00
beberlei
cfea7883e0 [2.0] DDC-91 - Enhanced SchemaManager::listTableIndexes() considerably. Add primary keys to the index list, add a bool flag primary to each index, add an array of columns to each index. Moved a test to SchemaFunctionalTestCase to check that every database (Mysql, Pgsql, Sqlite, Oracle) returns exactly the same data from this function. 2009-11-03 08:58:03 +00:00
jwage
37824abffe [2.0] Fixed incorrectly used variable for cli config 2009-11-03 04:13:35 +00:00
beberlei
d8bf040165 [2.0] DDC-105 - Fix for use of quote() in getSetCharsetSql(). 2009-11-02 23:13:46 +00:00
beberlei
d369d27f8b [2.0] DDC-84 - Added increment alter table / update schema tests for Postgres Platform - Fixed several bugs in Doctrine\DBAL\Platforms\PostgreSqlPlatform 2009-11-02 16:07:31 +00:00
beberlei
6a26de11ff [2.0] Fixed DDC-103 - Add missing changed file. 2009-11-02 15:10:26 +00:00
beberlei
79f4fcb3c4 [2.0] Fixed DDC-103 - Platform::getAlterTableSql() should return an array on all platforms, added doc-blocks on all methods and fixed some. 2009-11-02 15:08:51 +00:00
beberlei
140f597e3b [2.0] Fixed DDC-101, DDC-102 - Ensure defaults for string length and field nullability are handled consistently in both update and create schema commands of SchemaTool. 2009-11-02 12:53:05 +00:00
romanb
2fbc766de7 [2.0][DDC-82] Fixed CLI problems introduced by changeset 6582. 2009-11-01 17:58:56 +00:00
beberlei
4d3c4a704a [2.0] DDC-84 - Add Mysql Platform unittests for incremental changes of the metadata for the schematool update function. Fixed some quirks in the Unit-Test suite alongside, Fixed changes of length in SchemaTool update. 2009-10-31 22:23:36 +00:00
beberlei
a680970347 [2.0] DDC-87 - Fix MysqlSchemaManager missing support for Mysql Decimal type 2009-10-31 20:50:31 +00:00
beberlei
932855317f [2.0] DDC-62 - Fixed bug with proxy class generation of non-namespaced entities 2009-10-31 08:59:27 +00:00
beberlei
a05bd5e20c [2.0] DDC-78 - Added support for context specific information in Annotation Parser Syntax Error Exceptions. 2009-10-30 20:58:06 +00:00
jwage
a0c9e9db8d [2.0] Fixing casing issue 2009-10-30 20:24:50 +00:00
beberlei
881eb212d2 [2.0] Added test that shows AnnotationParser only parses string literals with double quotes, wheras single quotes throw an Syntax Error. Removed debug output on failure for a proper syntax error exception. 2009-10-30 00:36:21 +00:00
beberlei
1eec9f211b [2.0] Fixed DDC-77 - Prevent PHP Warning on certain annotation constallations 2009-10-30 00:20:17 +00:00
guilhermeblanco
49bcc69f3a [2.0] Moved EntityManager creation to be always available in CLI Tasks 2009-10-30 00:15:53 +00:00
romanb
10e3407ed1 [2.0][DDC-70] Added some EntityManager tests provided by beberlei. 2009-10-28 22:12:45 +00:00
romanb
f572c372dc [2.0] Fixed DDC-18. Simplified proxy classes. Just 1 proxy class per entity now, instead of 2. 2009-10-28 15:32:55 +00:00
romanb
aa72619c5d [2.0][DDC-55] Fixed. 2009-10-28 11:29:29 +00:00
romanb
ce6905cc5d [2.0] Fixed commit order calculation. 2009-10-28 11:00:17 +00:00
romanb
4fc1781d78 [2.0][DDC-22] Fixed. Also cleaned up association handling. More to come: exception refactorings, proxy simplifications (single proxy class, not two). 2009-10-28 10:31:47 +00:00
guilhermeblanco
e832d1723a [2.0] Fixed typo 2009-10-26 18:57:14 +00:00
romanb
ac4b4889a6 [2.0][DDC-57] Fixed. 2009-10-26 13:05:32 +00:00
romanb
4918d3e174 [2.0] Simplification and fix to cascades. 2009-10-25 22:04:13 +00:00
romanb
08694d1826 [2.0] Some optimizations and small fixes. 2009-10-25 21:40:57 +00:00
jwage
ccf27a386c [2.0] Minor fixes to cache drivers and result set cache implementation 2009-10-24 00:28:43 +00:00
romanb
a4913774c8 [2.0] Added ConnectionTest. Fixed sandbox. 2009-10-23 21:47:25 +00:00
romanb
4328a4e9e3 [2.0] Small refactorings on the cache drivers. Introduced flag to control whether the cache driver should manage the cache keys since this is an advanced feature that is not always needed and can have negative side-effects (higher probability for cache slams). 2009-10-23 15:03:00 +00:00
romanb
204b57e115 [2.0][DDC-57] Fixed. 2009-10-23 15:01:32 +00:00
jwage
1642f53bf4 [2.0][DDC-48] Fixed issue with getNamespacedId() being called twice 2009-10-23 05:36:47 +00:00
jwage
da38026bc2 [2.0][DDC-47] Added ability to set the result cache id used to store the cache entry 2009-10-22 22:39:37 +00:00
jwage
93e6cabe04 [2.0][DDC-48][DDC-47] Refactored cache drivers to allow more control over deleting, added namespacing to cache drivers and implemented clear-cache task 2009-10-22 22:19:17 +00:00
romanb
5b60f87859 [2.0] Fixed some known issues with inheritance, especially class table inheritance, like join columns not being selected. 2009-10-22 19:12:00 +00:00
romanb
ae9a4be658 [2.0] Formatting. 2009-10-22 12:53:25 +00:00
romanb
e2d678cc10 [2.0] Refactorings to reduce duplicated code and increase efficiency. 2009-10-22 12:50:58 +00:00
romanb
c54d582568 [2.0] Added test coverage for native query with joined one-to-one association. 2009-10-22 09:10:59 +00:00
guilhermeblanco
7ae913a5b5 [2.0] Fix for test suite. It was trying to recreate association tables and they're not getting deleted. SchemaTool was trying to recreate them during some executions. 2009-10-19 23:23:54 +00:00
romanb
2a16782528 [2.0][DDC-56] Fixed. 2009-10-18 20:36:02 +00:00
guilhermeblanco
bf68273a2a [2.0] Grammar rule fixes to prevent possibility to do key=field=identifier as a correct parseable grammar 2009-10-17 02:09:02 +00:00
guilhermeblanco
b8208211ff [2.0] Reverted wrong committed files 2009-10-17 02:03:43 +00:00
guilhermeblanco
038e6cadfb [2.0] Fix CLI documentation of schema-tool task 2009-10-17 01:57:50 +00:00
romanb
cc59231993 [2.0] Removed old comment. 2009-10-16 10:39:44 +00:00
romanb
9bb17475ed [2.0] Fixed hydration issue with bidirectional one-to-many associations. Added more test coverage for some advanced association queries and lazy-loading. 2009-10-16 10:35:46 +00:00
romanb
84d3cb971e [2.0] Removed debug code. 2009-10-15 19:04:27 +00:00
romanb
0b3ae4b169 [2.0] Removed all remaining references to deprecated allowPartialObjects option. 2009-10-15 19:03:27 +00:00
romanb
9200e17bc1 [2.0][DDC-51] Fixed. 2009-10-15 17:07:37 +00:00
romanb
5842411afe [2.0][DDC-49][DDC-50][DDC-33] Fixed DDC-49 and DDC-50. Also addressed DDC-33. Various other small changes and fixes. For problems with proxy objects please refer to the updated documentation. 2009-10-15 14:39:43 +00:00
romanb
cb1c7bce48 [2.0] DBAL cleanups (DDC-46). Proxy class improvements (DDC-19, DDC-39). Started new UPGRADE_TO document for upgrade instructions between advancing Doctrine 2 versions. 2009-10-14 20:18:36 +00:00
romanb
b9f744893e [2.0][DDC-42] Fixed. 2009-10-13 10:48:46 +00:00
jwage
f3f522b7f3 [2.0][DDC-43] Fixing order of limit and offset 2009-10-12 19:10:41 +00:00
romanb
7ec25f196a [2.0] Added missing recognition of the 'fetch' attribute in metadata drivers. 2009-10-12 12:54:14 +00:00
romanb
f731a083b6 [2.0][DDC-41] Fixed. Also related to DDC-2. 2009-10-12 11:55:22 +00:00
romanb
bb6e54fba1 [2.0][DDC-21] Fixed. 2009-10-09 14:27:35 +00:00
jwage
204b6d71f3 [2.0] Finishing the AnnotationExporter to export relationships properly 2009-10-08 22:11:10 +00:00
jwage
aba096cc66 [2.0] Fixed error with DoctrineException class not being used 2009-10-08 18:55:02 +00:00
jwage
471e3f8f0c [2.0] Fixed strict standards notice 2009-10-08 18:54:39 +00:00
jwage
6fd2eaa45d [2.0] Fix to DatabaseDriver so drivers that don't support foreign keys will still work 2009-10-08 18:54:19 +00:00
jwage
98cf9017a8 [2.0][DDC-35] Fixing accidental rename of file 2009-10-08 16:21:22 +00:00
jwage
a3c09d4cc2 [2.0] Adding better docs for some tasks 2009-10-07 23:39:34 +00:00
jwage
a7d4e1e466 [2.0] Refactoring some common code in to the AnnotationDriver and creating PhpDriver for consistancy 2009-10-07 22:14:13 +00:00
jwage
09a48a896e [2.0][DDC-34] Fixing issue with duplicate association mappings when dealing with mapped super classes 2009-10-07 18:53:30 +00:00
jwage
dba0764115 [2.0] Fixing exception messages for mapping fields and associations 2009-10-07 18:52:51 +00:00
jwage
bf90126edf [2.0] Adding exception outputting to CLI 2009-10-07 18:52:11 +00:00
romanb
b8bcd51ff2 [2.0][DDC-32] Fixed. 2009-10-07 12:39:46 +00:00
jwage
e1645efa76 [2.0] Misc. bug fixes 2009-10-07 07:45:08 +00:00
jwage
d1228063e6 [2.0] Removing unused file 2009-10-07 04:42:45 +00:00
jwage
165abc3ca4 [2.0] Work on mapping drivers, exporter drivers and reverse engineering of database schemas 2009-10-07 04:07:23 +00:00
jwage
c8362da494 [2.0] Added functionality to convert a Doctrine 1 schema to Doctrine 2 to help users with upgrading. Lots of other small bug fixes and changes. 2009-10-06 22:38:34 +00:00
romanb
71c1fe5221 [2.0][DDC-2] Fixed. 2009-10-06 10:04:32 +00:00
jwage
5fb493c5d1 [2.0] Adding test coverage for ClassMetadataExporter 2009-10-05 22:09:29 +00:00
jwage
e4e1291b6a [2.0] Bug fix for convert mapping to yaml and annotation directory iterating not being recursive 2009-10-05 18:19:00 +00:00
romanb
d0bb8ab2e4 [2.0] Fixed EntityManager#contains(). 2009-10-05 09:32:50 +00:00
jwage
b353dc5172 [2.0] Adding EntityRepository::createQueryBuilder() method 2009-10-05 05:42:30 +00:00
jwage
02519233f3 [2.0] Missing files for previous commit. 2009-10-05 04:29:26 +00:00
jwage
d1b2f93acb [2.0] Splitting ClassMetadata in to ClassMetadataInfo and other bug fixes 2009-10-05 04:11:29 +00:00
jwage
968ebb80c2 [2.0] Bug fixes 2009-10-04 19:35:47 +00:00
jwage
fb7adbbebb [2.0] Added exception if query builder is missing from or select when trying to get dql string 2009-10-04 00:06:22 +00:00
romanb
b9ec48d68e [2.0][DDC-31] Fixed. 2009-10-03 22:00:01 +00:00
guilhermeblanco
fe5a356aa0 [2.0][DDC-31] Fixed issue with column definition of 'name' when it is not set. 2009-10-03 16:19:51 +00:00
guilhermeblanco
679191a426 [2.0][DDC-30] Fixed null values with Date, Time and DateTime types. Thanks Ismo for report and patch 2009-10-03 16:05:49 +00:00
romanb
dce2d79046 [2.0][DDC-29] Fixed 2009-10-03 08:54:39 +00:00
romanb
b444ec0139 [2.0][DDC-28] Fixed 2009-10-03 08:44:53 +00:00