Trac
Changeset 4364
- Timestamp:
- 05/13/08 22:20:34 (2 months ago)
- Files:
-
- trunk/lib/Doctrine.php (modified) (7 diffs)
- trunk/lib/Doctrine/AuditLog.php (modified) (1 diff)
- trunk/lib/Doctrine/Builder/Record.php (modified) (3 diffs)
- trunk/lib/Doctrine/ClassMetadata.php (modified) (7 diffs)
- trunk/lib/Doctrine/ClassMetadata/Factory.php (modified) (2 diffs)
- trunk/lib/Doctrine/Collection.php (modified) (7 diffs)
- trunk/lib/Doctrine/Collection/Iterator.php (modified) (1 diff)
- trunk/lib/Doctrine/Collection/Offset.php (modified) (1 diff)
- trunk/lib/Doctrine/Connection.php (modified) (9 diffs)
- trunk/lib/Doctrine/Connection/UnitOfWork.php (modified) (12 diffs)
- trunk/lib/Doctrine/Data.php (modified) (2 diffs)
- trunk/lib/Doctrine/Data/Import.php (modified) (1 diff)
- trunk/lib/Doctrine/Entity (added)
- trunk/lib/Doctrine/Entity.php (added)
- trunk/lib/Doctrine/Entity/Exception.php (added)
- trunk/lib/Doctrine/EntityRepository.php (modified) (2 diffs)
- trunk/lib/Doctrine/EventListener/Chain.php (modified) (4 diffs)
- trunk/lib/Doctrine/Export.php (modified) (6 diffs)
- trunk/lib/Doctrine/Export/Schema.php (modified) (1 diff)
- trunk/lib/Doctrine/File.php (modified) (1 diff)
- trunk/lib/Doctrine/File/Index.php (modified) (1 diff)
- trunk/lib/Doctrine/Hydrator.php (modified) (3 diffs)
- trunk/lib/Doctrine/Hydrator/Abstract.php (modified) (3 diffs)
- trunk/lib/Doctrine/Hydrator/ArrayDriver.php (modified) (2 diffs)
- trunk/lib/Doctrine/Hydrator/RecordDriver.php (modified) (4 diffs)
- trunk/lib/Doctrine/HydratorNew.php (modified) (9 diffs)
- trunk/lib/Doctrine/Import.php (modified) (1 diff)
- trunk/lib/Doctrine/Import/Schema.php (modified) (3 diffs)
- trunk/lib/Doctrine/Lib.php (modified) (3 diffs)
- trunk/lib/Doctrine/Locking/Manager/Pessimistic.php (modified) (4 diffs)
- trunk/lib/Doctrine/Mapper.php (modified) (22 diffs)
- trunk/lib/Doctrine/Mapper/DefaultStrategy.php (modified) (4 diffs)
- trunk/lib/Doctrine/Mapper/JoinedStrategy.php (modified) (7 diffs)
- trunk/lib/Doctrine/Mapper/Strategy.php (modified) (3 diffs)
- trunk/lib/Doctrine/Node.php (modified) (5 diffs)
- trunk/lib/Doctrine/Node/Interface.php (modified) (20 diffs)
- trunk/lib/Doctrine/Node/NestedSet.php (modified) (21 diffs)
- trunk/lib/Doctrine/Node/NestedSet/PreOrderIterator.php (modified) (1 diff)
- trunk/lib/Doctrine/Query.php (modified) (1 diff)
- trunk/lib/Doctrine/Query/Abstract.php (modified) (3 diffs)
- trunk/lib/Doctrine/Query/ParserResultDummy.php (added)
- trunk/lib/Doctrine/Record.php (deleted)
- trunk/lib/Doctrine/Record/Filter.php (modified) (2 diffs)
- trunk/lib/Doctrine/Record/Filter/Compound.php (modified) (2 diffs)
- trunk/lib/Doctrine/Record/Filter/Standard.php (modified) (2 diffs)
- trunk/lib/Doctrine/Record/Iterator.php (modified) (2 diffs)
- trunk/lib/Doctrine/Relation.php (modified) (1 diff)
- trunk/lib/Doctrine/Relation/Association.php (modified) (1 diff)
- trunk/lib/Doctrine/Relation/Association/Self.php (modified) (1 diff)
- trunk/lib/Doctrine/Relation/ForeignKey.php (modified) (1 diff)
- trunk/lib/Doctrine/Relation/LocalKey.php (modified) (1 diff)
- trunk/lib/Doctrine/Relation/Nest.php (modified) (1 diff)
- trunk/lib/Doctrine/Search.php (modified) (1 diff)
- trunk/lib/Doctrine/Template.php (modified) (3 diffs)
- trunk/lib/Doctrine/Template/Geographical.php (modified) (1 diff)
- trunk/lib/Doctrine/Transaction.php (modified) (1 diff)
- trunk/lib/Doctrine/Tree/Interface.php (modified) (1 diff)
- trunk/lib/Doctrine/Tree/NestedSet.php (modified) (3 diffs)
- trunk/lib/Doctrine/Validator.php (modified) (2 diffs)
- trunk/lib/Doctrine/Validator/Unique.php (modified) (1 diff)
- trunk/lib/Doctrine/View.php (modified) (1 diff)
- trunk/tests/Orm/Hydration/BasicHydrationTest.php (modified) (17 diffs)
- trunk/tests/Orm/UnitOfWorkTestCase.php (modified) (1 diff)
- trunk/tests/models/cms/CmsArticle.php (modified) (1 diff)
- trunk/tests/models/cms/CmsComment.php (modified) (1 diff)
- trunk/tests/models/cms/CmsPhonenumber.php (modified) (1 diff)
- trunk/tests/models/cms/CmsUser.php (modified) (1 diff)
- trunk/tests/models/forum/ForumBoard.php (modified) (1 diff)
- trunk/tests/models/forum/ForumCategory.php (modified) (1 diff)
- trunk/tests/models/forum/ForumUser.php (modified) (1 diff)
- trunk/tests_old/CacheFileTestCase.php (modified) (1 diff)
- trunk/tests_old/CacheSqliteTestCase.php (modified) (3 diffs)
- trunk/tests_old/ClassTableInheritanceTestCase.php (modified) (2 diffs)
- trunk/tests_old/CollectionOffsetTestCase.php (modified) (5 diffs)
- trunk/tests_old/CollectionTestCase.php (modified) (4 diffs)
- trunk/tests_old/ConnectionTestCase.php (modified) (1 diff)
- trunk/tests_old/CtiColumnAggregationTestCase.php (modified) (2 diffs)
- trunk/tests_old/CustomPrimaryKeyTestCase.php (modified) (1 diff)
- trunk/tests_old/DataType/BooleanTestCase.php (modified) (3 diffs)
- trunk/tests_old/Hydrate/FetchModeTestCase.php (modified) (3 diffs)
- trunk/tests_old/HydrateTestCase.php (modified) (1 diff)
- trunk/tests_old/Inheritance/JoinedTestCase.php (modified) (1 diff)
- trunk/tests_old/Inheritance/SingleTableTestCase.php (modified) (1 diff)
- trunk/tests_old/Inheritance/TablePerClassTestCase.php (modified) (1 diff)
- trunk/tests_old/Metadata/FactoryTestCase.php (modified) (2 diffs)
- trunk/tests_old/PessimisticLockingTestCase.php (modified) (1 diff)
- trunk/tests_old/PluginTestCase.php (modified) (2 diffs)
- trunk/tests_old/Query/AggregateValueTestCase.php (modified) (3 diffs)
- trunk/tests_old/Query/SelectTestCase.php (modified) (1 diff)
- trunk/tests_old/RawSqlTestCase.php (modified) (2 diffs)
- trunk/tests_old/Record/FilterTestCase.php (modified) (2 diffs)
- trunk/tests_old/Record/HookTestCase.php (modified) (1 diff)
- trunk/tests_old/Record/InheritanceTestCase.php (modified) (2 diffs)
- trunk/tests_old/Record/StateTestCase.php (modified) (11 diffs)
- trunk/tests_old/RecordTestCase.php (modified) (20 diffs)
- trunk/tests_old/Relation/AccessTestCase.php (modified) (1 diff)
- trunk/tests_old/Relation/NestTestCase.php (modified) (5 diffs)
- trunk/tests_old/TableTestCase.php (modified) (4 diffs)
- trunk/tests_old/Ticket/438TestCase.php (modified) (3 diffs)
- trunk/tests_old/Ticket/480TestCase.php (modified) (1 diff)
- trunk/tests_old/Ticket/626BTestCase.php (modified) (4 diffs)
- trunk/tests_old/Ticket/626CTestCase.php (modified) (2 diffs)
- trunk/tests_old/Ticket/626DTestCase.php (modified) (1 diff)
- trunk/tests_old/Ticket/638TestCase.php (modified) (3 diffs)
- trunk/tests_old/Ticket/642TestCase.php (modified) (1 diff)
- trunk/tests_old/Ticket/673TestCase.php (modified) (1 diff)
- trunk/tests_old/Ticket/697TestCase.php (modified) (1 diff)
- trunk/tests_old/Ticket/741TestCase.php (modified) (2 diffs)
- trunk/tests_old/Ticket/749TestCase.php (modified) (2 diffs)
- trunk/tests_old/Ticket/912TestCase.php (modified) (5 diffs)
- trunk/tests_old/ValidatorTestCase.php (modified) (2 diffs)
- trunk/tests_old/ViewTestCase.php (modified) (1 diff)
- trunk/tests_old/models/Account.php (modified) (1 diff)
- trunk/tests_old/models/Address.php (modified) (1 diff)
- trunk/tests_old/models/Album.php (modified) (1 diff)
- trunk/tests_old/models/App.php (modified) (1 diff)
- trunk/tests_old/models/App_Category.php (modified) (1 diff)
- trunk/tests_old/models/App_User.php (modified) (1 diff)
- trunk/tests_old/models/Assignment.php (modified) (1 diff)
- trunk/tests_old/models/Auth.php (modified) (1 diff)
- trunk/tests_old/models/Author.php (modified) (1 diff)
- trunk/tests_old/models/BadlyNamed__Class.php (modified) (1 diff)
- trunk/tests_old/models/BarRecord.php (modified) (1 diff)
- trunk/tests_old/models/BaseSymfonyRecord.php (modified) (1 diff)
- trunk/tests_old/models/Blog.php (modified) (2 diffs)
- trunk/tests_old/models/BlogTag.php (modified) (1 diff)
- trunk/tests_old/models/BoardWithPosition.php (modified) (1 diff)
- trunk/tests_old/models/Book.php (modified) (1 diff)
- trunk/tests_old/models/Bookmark.php (modified) (1 diff)
- trunk/tests_old/models/BookmarkUser.php (modified) (1 diff)
- trunk/tests_old/models/BooleanTest.php (modified) (1 diff)
- trunk/tests_old/models/CPK_Association.php (modified) (1 diff)
- trunk/tests_old/models/CPK_Test.php (modified) (1 diff)
- trunk/tests_old/models/CPK_Test2.php (modified) (1 diff)
- trunk/tests_old/models/CascadeDeleteRelatedTest.php (modified) (1 diff)
- trunk/tests_old/models/CascadeDeleteRelatedTest2.php (modified) (1 diff)
- trunk/tests_old/models/CascadeDeleteTest.php (modified) (1 diff)
- trunk/tests_old/models/CategoryNestedSet.php (modified) (1 diff)
- trunk/tests_old/models/CategoryWithPosition.php (modified) (1 diff)
- trunk/tests_old/models/CheckConstraintTest.php (modified) (1 diff)
- trunk/tests_old/models/ClientModel.php (modified) (3 diffs)
- trunk/tests_old/models/ColumnAliasTest.php (modified) (1 diff)
- trunk/tests_old/models/ConcreteEmail.php (modified) (1 diff)
- trunk/tests_old/models/ConcreteGroup.php (modified) (1 diff)
- trunk/tests_old/models/ConcreteGroupUser.php (modified) (1 diff)
- trunk/tests_old/models/ConcreteInheritanceTestParent.php (modified) (1 diff)
- trunk/tests_old/models/ConcreteUser.php (modified) (1 diff)
- trunk/tests_old/models/CoverageCodeN.php (modified) (1 diff)
- trunk/tests_old/models/CustomPK.php (modified) (1 diff)
- trunk/tests_old/models/CustomSequenceRecord.php (modified) (1 diff)
- trunk/tests_old/models/Data_File.php (modified) (1 diff)
- trunk/tests_old/models/DateTest.php (modified) (1 diff)
- trunk/tests_old/models/Description.php (modified) (1 diff)
- trunk/tests_old/models/Element.php (modified) (1 diff)
- trunk/tests_old/models/Email.php (modified) (1 diff)
- trunk/tests_old/models/Entity.php (modified) (1 diff)
- trunk/tests_old/models/EntityAddress.php (modified) (1 diff)
- trunk/tests_old/models/EntityReference.php (modified) (1 diff)
- trunk/tests_old/models/EnumTest.php (modified) (1 diff)
- trunk/tests_old/models/EnumTest2.php (modified) (1 diff)
- trunk/tests_old/models/EnumTest3.php (modified) (1 diff)
- trunk/tests_old/models/Error.php (modified) (1 diff)
- trunk/tests_old/models/EventListenerChainTest.php (modified) (1 diff)
- trunk/tests_old/models/EventListenerTest.php (modified) (1 diff)
- trunk/tests_old/models/FieldNameTest.php (modified) (1 diff)
- trunk/tests_old/models/File_Owner.php (modified) (1 diff)
- trunk/tests_old/models/FilterTest.php (modified) (1 diff)
- trunk/tests_old/models/FilterTest2.php (modified) (1 diff)
- trunk/tests_old/models/FooBarRecord.php (modified) (1 diff)
- trunk/tests_old/models/FooForeignlyOwned.php (modified) (1 diff)
- trunk/tests_old/models/FooForeignlyOwnedWithPK.php (modified) (1 diff)
- trunk/tests_old/models/FooLocallyOwned.php (modified) (1 diff)
- trunk/tests_old/models/FooRecord.php (modified) (1 diff)
- trunk/tests_old/models/FooReferenceRecord.php (modified) (1 diff)
- trunk/tests_old/models/ForeignKeyTest.php (modified) (1 diff)
- trunk/tests_old/models/ForeignKeyTest2.php (modified) (1 diff)
- trunk/tests_old/models/Forum_Board.php (modified) (1 diff)
- trunk/tests_old/models/Forum_Category.php (modified) (1 diff)
- trunk/tests_old/models/Forum_Entry.php (modified) (1 diff)
- trunk/tests_old/models/Forum_Thread.php (modified) (1 diff)
- trunk/tests_old/models/Groupuser.php (modified) (1 diff)
- trunk/tests_old/models/GzipTest.php (modified) (1 diff)
- trunk/tests_old/models/I18nTest.php (modified) (1 diff)
- trunk/tests_old/models/InheritanceDeal.php (modified) (1 diff)
- trunk/tests_old/models/InheritanceDealUser.php (modified) (1 diff)
- trunk/tests_old/models/InheritanceUser.php (modified) (1 diff)
- trunk/tests_old/models/JC1.php (modified) (1 diff)
- trunk/tests_old/models/JC2.php (modified) (1 diff)
- trunk/tests_old/models/JC3.php (modified) (1 diff)
- trunk/tests_old/models/LiabilityCodeN.php (modified) (1 diff)
- trunk/tests_old/models/Location.php (modified) (1 diff)
- trunk/tests_old/models/LocationI18n.php (modified) (1 diff)
- trunk/tests_old/models/Log_Entry.php (modified) (1 diff)
- trunk/tests_old/models/Log_Status.php (modified) (1 diff)
- trunk/tests_old/models/M2MTest.php (modified) (1 diff)
- trunk/tests_old/models/M2MTest2.php (modified) (1 diff)
- trunk/tests_old/models/MigrationTest.php (modified) (1 diff)
- trunk/tests_old/models/MyGroup.php (modified) (1 diff)
- trunk/tests_old/models/MyOneThing.php (modified) (1 diff)
- trunk/tests_old/models/MyOtherThing.php (modified) (1 diff)
- trunk/tests_old/models/MyUser.php (modified) (1 diff)
- trunk/tests_old/models/MyUser2.php (modified) (1 diff)
- trunk/tests_old/models/MyUserGroup.php (modified) (1 diff)
- trunk/tests_old/models/MyUserOneThing.php (modified) (1 diff)
- trunk/tests_old/models/MyUserOtherThing.php (modified) (1 diff)
- trunk/tests_old/models/MysqlGroup.php (modified) (1 diff)
- trunk/tests_old/models/MysqlGroupMember.php (modified) (1 diff)
- trunk/tests_old/models/MysqlIndexTestRecord.php (modified) (1 diff)
- trunk/tests_old/models/MysqlTestRecord.php (modified) (1 diff)
- trunk/tests_old/models/MysqlUser.php (modified) (1 diff)
- trunk/tests_old/models/NestReference.php (modified) (1 diff)
- trunk/tests_old/models/NestTest.php (modified) (1 diff)
- trunk/tests_old/models/NestedSetTest_SingleRootNode.php (modified) (1 diff)
- trunk/tests_old/models/NotNullTest.php (modified) (1 diff)
- trunk/tests_old/models/ORM_AccessControl.php (modified) (1 diff)
- trunk/tests_old/models/ORM_AccessControlsGroups.php (modified) (1 diff)
- trunk/tests_old/models/ORM_AccessGroup.php (modified) (1 diff)
- trunk/tests_old/models/ORM_TestEntry.php (modified) (1 diff)
- trunk/tests_old/models/ORM_TestItem.php (modified) (1 diff)
- trunk/tests_old/models/Package.php (modified) (1 diff)
- trunk/tests_old/models/PackageVersion.php (modified) (1 diff)
- trunk/tests_old/models/PackageVersionNotes.php (modified) (1 diff)
- trunk/tests_old/models/Page.php (modified) (1 diff)
- trunk/tests_old/models/Phonenumber.php (modified) (1 diff)
- trunk/tests_old/models/Photo.php (modified) (1 diff)
- trunk/tests_old/models/Phototag.php (modified) (1 diff)
- trunk/tests_old/models/Policy.php (modified) (1 diff)
- trunk/tests_old/models/PolicyAsset.php (modified) (1 diff)
- trunk/tests_old/models/PolicyCodeN.php (modified) (1 diff)
- trunk/tests_old/models/PolicyN.php (modified) (1 diff)
- trunk/tests_old/models/QueryTest_Board.php (modified) (1 diff)
- trunk/tests_old/models/QueryTest_Category.php (modified) (1 diff)
- trunk/tests_old/models/QueryTest_Entry.php (modified) (1 diff)
- trunk/tests_old/models/QueryTest_Item.php (modified) (1 diff)
- trunk/tests_old/models/QueryTest_Rank.php (modified) (1 diff)
- trunk/tests_old/models/QueryTest_User.php (modified) (1 diff)
- trunk/tests_old/models/QueryTest_UserRank.php (modified) (1 diff)
- trunk/tests_old/models/RTC1.php (modified) (1 diff)
- trunk/tests_old/models/RTC2.php (modified) (1 diff)
- trunk/tests_old/models/RTC3.php (modified) (1 diff)
- trunk/tests_old/models/RTC4.php (modified) (1 diff)
- trunk/tests_old/models/RateN.php (modified) (1 diff)
- trunk/tests_old/models/Rec1.php (modified) (1 diff)
- trunk/tests_old/models/Rec2.php (modified) (1 diff)
- trunk/tests_old/models/RecordFilterTest.php (modified) (1 diff)
- trunk/tests_old/models/RecordHookTest.php (modified) (1 diff)
- trunk/tests_old/models/Record_City.php (modified) (1 diff)
- trunk/tests_old/models/Record_Country.php (modified) (1 diff)
- trunk/tests_old/models/Record_District.php (modified) (1 diff)
- trunk/tests_old/models/RelationTest.php (modified) (1 diff)
- trunk/tests_old/models/Resource.php (modified) (1 diff)
- trunk/tests_old/models/ResourceReference.php (modified) (1 diff)
- trunk/tests_old/models/ResourceType.php (modified) (1 diff)
- trunk/tests_old/models/Role.php (modified) (1 diff)
- trunk/tests_old/models/SearchTest.php (modified) (1 diff)
- trunk/tests_old/models/SelfRefTest.php (modified) (1 diff)
- trunk/tests_old/models/SequenceRecord.php (modified) (1 diff)
- trunk/tests_old/models/SerializeTest.php (modified) (1 diff)
- trunk/tests_old/models/SoftDeleteTest.php (modified) (1 diff)
- trunk/tests_old/models/Song.php (modified) (1 diff)
- trunk/tests_old/models/Tag.php (modified) (1 diff)
- trunk/tests_old/models/Task.php (modified) (1 diff)
- trunk/tests_old/models/TestMovie.php (modified) (1 diff)
- trunk/tests_old/models/TestMovieUserBookmark.php (modified) (1 diff)
- trunk/tests_old/models/TestMovieUserVote.php (modified) (1 diff)
- trunk/tests_old/models/TestRecord.php (modified) (1 diff)
- trunk/tests_old/models/TestUser.php (modified) (1 diff)
- trunk/tests_old/models/TreeLeaf.php (modified) (1 diff)
- trunk/tests_old/models/ValidatorTest.php (modified) (1 diff)
- trunk/tests_old/models/ValidatorTest_AddressModel.php (modified) (1 diff)
- trunk/tests_old/models/ValidatorTest_ClientModel.php (modified) (1 diff)
- trunk/tests_old/models/ValidatorTest_ClientToAddressModel.php (modified) (1 diff)
- trunk/tests_old/models/ValidatorTest_DateModel.php (modified) (1 diff)
- trunk/tests_old/models/ValidatorTest_FootballPlayer.php (modified) (1 diff)
- trunk/tests_old/models/ValidatorTest_Person.php (modified) (1 diff)
- trunk/tests_old/models/VersioningTest.php (modified) (1 diff)
- trunk/tests_old/models/ZeroValueTest.php (modified) (1 diff)
- trunk/tests_old/models/export/Cms_Category.php (modified) (1 diff)
- trunk/tests_old/models/export/Cms_CategoryLanguages.php (modified) (1 diff)
- trunk/tests_old/models/gnatEmail.php (modified) (1 diff)
- trunk/tests_old/models/gnatUser.php (modified) (1 diff)
- trunk/tests_old/models/mmrGroupUser_B.php (modified) (1 diff)
- trunk/tests_old/models/mmrGroupUser_C.php (modified) (1 diff)
- trunk/tests_old/models/mmrGroup_B.php (modified) (1 diff)
- trunk/tests_old/models/mmrGroup_C.php (modified) (1 diff)
- trunk/tests_old/models/mmrUser_B.php (modified) (1 diff)
- trunk/tests_old/models/mmrUser_C.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/Doctrine.php
r4225 r4364 290 290 * FETCHMODE_RECORD 291 291 * 292 * Specifies that the fetch method shall return Doctrine_ Record292 * Specifies that the fetch method shall return Doctrine_Entity 293 293 * objects as the elements of the result set. 294 294 * … … 472 472 */ 473 473 const HYDRATE_NONE = 4; 474 475 /* new hydration modes. move to Query class when it's time. */ 476 //const HYDRATE_IDENTITY_OBJECT = 1; // default, auto-adds PKs, produces object graphs 477 //const HYDRATE_IDENTITY_ARRAY = 2; // auto-adds PKs, produces array graphs 478 //const HYDRATE_SCALAR = 3; // produces flat result list with scalar values 479 //const HYDRATE_SINGLE_SCALAR = 4; // produces a single scalar value 480 //const HYDRATE_NONE = 5; // produces a result set as it's returned by the db 481 474 482 475 483 /** … … 710 718 * Get all the loaded models, you can provide an array of classes or it will use get_declared_classes() 711 719 * 712 * Will filter through an array of classes and return the Doctrine_ Records out of them.713 * If you do not specify $classes it will return all of the currently loaded Doctrine_ Records720 * Will filter through an array of classes and return the Doctrine_Entitys out of them. 721 * If you do not specify $classes it will return all of the currently loaded Doctrine_Entitys 714 722 * 715 723 * @return array $loadedModels … … 748 756 * isValidModelClass 749 757 * 750 * Checks if what is passed is a valid Doctrine_ Record758 * Checks if what is passed is a valid Doctrine_Entity 751 759 * Will load class in to memory in order to inflect it and find out information about the class 752 760 * … … 756 764 public static function isValidModelClass($class) 757 765 { 758 if ($class instanceof Doctrine_ Record) {766 if ($class instanceof Doctrine_Entity) { 759 767 $class = get_class($class); 760 768 } … … 767 775 // Skip the following classes 768 776 // - abstract classes 769 // - not a subclass of Doctrine_ Record777 // - not a subclass of Doctrine_Entity 770 778 // - don't have a setTableDefinition method 771 779 if (!$class->isAbstract() && 772 $class->isSubClassOf('Doctrine_ Record')) {780 $class->isSubClassOf('Doctrine_Entity')) { 773 781 774 782 return true; … … 806 814 * generateModelsFromDb 807 815 * 808 * method for importing existing schema to Doctrine_ Recordclasses816 * method for importing existing schema to Doctrine_Entity classes 809 817 * 810 818 * @param string $directory Directory to write your models to trunk/lib/Doctrine/AuditLog.php
r3882 r4364 56 56 * Get the version 57 57 * 58 * @param Doctrine_ Record$record58 * @param Doctrine_Entity $record 59 59 * @param mixed $version 60 60 * @return array An array with version information 61 61 */ 62 public function getVersion(Doctrine_ Record$record, $version)62 public function getVersion(Doctrine_Entity $record, $version) 63 63 { 64 64 $className = $this->_options['className']; trunk/lib/Doctrine/Builder/Record.php
r3882 r4364 23 23 * Doctrine_Builder_Record 24 24 * 25 * Import builder is responsible of building Doctrine_ Recordclasses25 * Import builder is responsible of building Doctrine_Entity classes 26 26 * based on a database schema. 27 27 * … … 94 94 * @var string 95 95 */ 96 protected $_baseClassName = 'Doctrine_ Record';96 protected $_baseClassName = 'Doctrine_Entity'; 97 97 98 98 /** … … 271 271 272 272 /* 273 * Build the table definition of a Doctrine_ Recordobject273 * Build the table definition of a Doctrine_Entity object 274 274 * 275 275 * @param string $table trunk/lib/Doctrine/ClassMetadata.php
r4338 r4364 138 138 */ 139 139 protected $_mappedColumns = array(); 140 141 /** 142 * The mapped embedded values (value objects). 143 * 144 * @var array 145 * @TODO Implementation (Value Object support) 146 */ 147 protected $_mappedEmbeddedValues = array(); 140 148 141 149 /** … … 172 180 173 181 /** 174 * Cached column count, Doctrine_ Recorduses this column count when182 * Cached column count, Doctrine_Entity uses this column count when 175 183 * determining its state. 176 184 * … … 1572 1580 * 1573 1581 * @param array $queryParts an array of pre-bound query parts 1574 * @return Doctrine_ Recordthis object1582 * @return Doctrine_Entity this object 1575 1583 */ 1576 1584 public function bindQueryParts(array $queryParts) … … 1586 1594 * @param string $queryPart 1587 1595 * @param mixed $value 1588 * @return Doctrine_ Recordthis object1596 * @return Doctrine_Entity this object 1589 1597 */ 1590 1598 public function bindQueryPart($queryPart, $value) … … 1720 1728 * @param mixed $constraint either a SQL constraint portion or an array of CHECK constraints 1721 1729 * @param string $name optional constraint name 1722 * @return Doctrine_ Recordthis object1730 * @return Doctrine_Entity this object 1723 1731 * @todo Should be done through $_tableOptions 1724 1732 */ … … 1835 1843 * @param string $options relation options 1836 1844 * @see Doctrine_Relation::_$definition 1837 * @return Doctrine_ Recordthis object1845 * @return Doctrine_Entity this object 1838 1846 */ 1839 1847 public function hasOne() … … 1851 1859 * @param string $options relation options 1852 1860 * @see Doctrine_Relation::_$definition 1853 * @return Doctrine_ Recordthis object1861 * @return Doctrine_Entity this object 1854 1862 */ 1855 1863 public function hasMany() trunk/lib/Doctrine/ClassMetadata/Factory.php
r4119 r4364 80 80 $loadedParentClass = false; 81 81 while ($parentClass = get_parent_class($parentClass)) { 82 if ($parentClass == 'Doctrine_ Record') {82 if ($parentClass == 'Doctrine_Entity') { 83 83 break; 84 84 } … … 160 160 // get parent classes 161 161 do { 162 if ($className === 'Doctrine_ Record') {162 if ($className === 'Doctrine_Entity') { 163 163 break; 164 164 } else if ($className == $name) { trunk/lib/Doctrine/Collection.php
r4338 r4364 59 59 * This record this collection is attached to, if any. 60 60 * 61 * @var Doctrine_ Record61 * @var Doctrine_Entity 62 62 */ 63 63 protected $reference; … … 309 309 * @return void 310 310 */ 311 public function setReference(Doctrine_ Record$record, Doctrine_Relation $relation)311 public function setReference(Doctrine_Entity $record, Doctrine_Relation $relation) 312 312 { 313 313 $this->reference = $record; … … 369 369 * 370 370 */ 371 public function search(Doctrine_ Record$record)371 public function search(Doctrine_Entity $record) 372 372 { 373 373 return array_search($record, $this->data, true); … … 389 389 * 390 390 * @param mixed $key the key of the element 391 * @return Doctrine_ Recordreturn a specified record391 * @return Doctrine_Entity return a specified record 392 392 */ 393 393 public function get($key) … … 482 482 * set 483 483 * @param integer $key 484 * @param Doctrine_ Record$record484 * @param Doctrine_Entity $record 485 485 * @return void 486 * @internal Can't type-hint the second parameter to Doctrine_ Recordbecause we need486 * @internal Can't type-hint the second parameter to Doctrine_Entity because we need 487 487 * to adhere to the Doctrine_Access::set() signature. 488 488 */ 489 489 public function set($key, $record) 490 490 { 491 if ( ! $record instanceOf Doctrine_ Record) {492 throw new Doctrine_Collection_Exception('Value variable in set is not an instance of Doctrine_ Record');491 if ( ! $record instanceOf Doctrine_Entity) { 492 throw new Doctrine_Collection_Exception('Value variable in set is not an instance of Doctrine_Entity'); 493 493 } 494 494 … … 501 501 /** 502 502 * adds a record to collection 503 * @param Doctrine_ Record$record record to be added503 * @param Doctrine_Entity $record record to be added 504 504 * @param string $key optional key for the record 505 505 * @return boolean … … 507 507 public function add($record, $key = null) 508 508 { 509 if ( ! $record instanceof Doctrine_ Record) {510 throw new Doctrine_Record_Exception('Value variable in set is not an instance of Doctrine_ Record.');509 if ( ! $record instanceof Doctrine_Entity) { 510 throw new Doctrine_Record_Exception('Value variable in set is not an instance of Doctrine_Entity.'); 511 511 } 512 512 trunk/lib/Doctrine/Collection/Iterator.php
r3882 r4364 97 97 * returns the current record 98 98 * 99 * @return Doctrine_ Record99 * @return Doctrine_Entity 100 100 */ 101 101 public function current() trunk/lib/Doctrine/Collection/Offset.php
r3882 r4364 21 21 /** 22 22 * Doctrine_Collection_Offset 23 * Collection of Doctrine_ Recordobjects.23 * Collection of Doctrine_Entity objects. 24 24 * 25 25 * @package Doctrine trunk/lib/Doctrine/Connection.php
r4338 r4364 146 146 */ 147