diff --git a/manual/codes/Object relational mapping - Introduction.php b/manual/codes/Object relational mapping - Introduction.php deleted file mode 100644 index 9e8f63bf1..000000000 --- a/manual/codes/Object relational mapping - Introduction.php +++ /dev/null @@ -1,34 +0,0 @@ -setTableName('emails'); - - $this->hasColumn("address", // name of the column - "string", // column type - "200", // column length - array("notblank" => true, - "email" => true // validators / constraints - ) - ); - - - $this->hasColumn("address2", // name of the column - "string", // column type - "200", // column length - // validators / constraints without arguments can be - // specified also as as string with | separator - "notblank|email" - ); - - // Doctrine even supports the following format for - // validators / constraints which have no arguments: - - $this->hasColumn("address3", // name of the column - "string", // column type - "200", // column length - array("notblank", "email") - ); - } -} -?> diff --git a/manual/codes/Object relational mapping - Record identifiers - Autoincremented.php b/manual/codes/Object relational mapping - Record identifiers - Autoincremented.php index 555c1243f..d1c007033 100644 --- a/manual/codes/Object relational mapping - Record identifiers - Autoincremented.php +++ b/manual/codes/Object relational mapping - Record identifiers - Autoincremented.php @@ -1,7 +1,8 @@ hasColumn("uid","integer",20,"primary|autoincrement"); + $this->hasColumn('uid','integer',20,'primary|autoincrement'); + } } ?> diff --git a/manual/codes/Object relational mapping - Record identifiers - Composite.php b/manual/codes/Object relational mapping - Record identifiers - Composite.php index 66a808a02..db653bfd5 100644 --- a/manual/codes/Object relational mapping - Record identifiers - Composite.php +++ b/manual/codes/Object relational mapping - Record identifiers - Composite.php @@ -1,8 +1,8 @@ hasColumn("user_id", "integer", 20, "primary"); - $this->hasColumn("group_id", "integer", 20, "primary"); + $this->hasColumn('user_id', 'integer', 20, 'primary'); + $this->hasColumn('group_id', 'integer', 20, 'primary'); } } ?> diff --git a/manual/codes/Object relational mapping - Record identifiers - Natural.php b/manual/codes/Object relational mapping - Record identifiers - Natural.php index 0631fd9e0..2eaccf222 100644 --- a/manual/codes/Object relational mapping - Record identifiers - Natural.php +++ b/manual/codes/Object relational mapping - Record identifiers - Natural.php @@ -1,7 +1,7 @@ hasColumn("name","string",200,"primary"); + $this->hasColumn('name','string',200,'primary'); } } ?> diff --git a/manual/codes/Object relational mapping - Relations - Foreign key associations - One-to-Many, Many-to-One.php b/manual/codes/Object relational mapping - Relations - Foreign key associations - One-to-Many, Many-to-One.php index 6b05ecb83..7b8908c2d 100644 --- a/manual/codes/Object relational mapping - Relations - Foreign key associations - One-to-Many, Many-to-One.php +++ b/manual/codes/Object relational mapping - Relations - Foreign key associations - One-to-Many, Many-to-One.php @@ -1,18 +1,18 @@ ownsMany("Phonenumber","Phonenumber.user_id"); + $this->ownsMany('Phonenumber','Phonenumber.user_id'); } public function setTableDefition() { - $this->hasColumn("name","string",50); - $this->hasColumn("loginname","string",20); - $this->hasColumn("password","string",16); + $this->hasColumn('name','string',50); + $this->hasColumn('loginname','string',20); + $this->hasColumn('password','string',16); } } class Phonenumber extends Doctrine_Record { public function setTableDefinition() { - $this->hasColumn("phonenumber","string",50); - $this->hasColumn("user_id","integer"); + $this->hasColumn('phonenumber','string',50); + $this->hasColumn('user_id','integer'); } } ?> diff --git a/manual/codes/Object relational mapping - Relations - Foreign key associations - One-to-One.php b/manual/codes/Object relational mapping - Relations - Foreign key associations - One-to-One.php index 9b91f625a..23703b19c 100644 --- a/manual/codes/Object relational mapping - Relations - Foreign key associations - One-to-One.php +++ b/manual/codes/Object relational mapping - Relations - Foreign key associations - One-to-One.php @@ -1,28 +1,28 @@ hasOne("Address","Address.user_id"); - $this->ownsOne("Email","User.email_id"); - $this->ownsMany("Phonenumber","Phonenumber.user_id"); + $this->hasOne('Address','Address.user_id'); + $this->ownsOne('Email','User.email_id'); + $this->ownsMany('Phonenumber','Phonenumber.user_id'); } public function setTableDefition() { - $this->hasColumn("name","string",50); - $this->hasColumn("loginname","string",20); - $this->hasColumn("password","string",16); + $this->hasColumn('name','string',50); + $this->hasColumn('loginname','string',20); + $this->hasColumn('password','string',16); // foreign key column for email ID - $this->hasColumn("email_id","integer"); + $this->hasColumn('email_id','integer'); } } class Email extends Doctrine_Record { public function setTableDefinition() { - $this->hasColumn("address","string",150); + $this->hasColumn('address','string',150); } } class Address extends Doctrine_Record { public function setTableDefinition() { - $this->hasColumn("street","string",50); - $this->hasColumn("user_id","integer"); + $this->hasColumn('street','string',50); + $this->hasColumn('user_id','integer'); } } ?> diff --git a/manual/codes/Object relational mapping - Relations - Foreign key associations - Tree structure.php b/manual/codes/Object relational mapping - Relations - Foreign key associations - Tree structure.php index eacecde72..768bbb663 100644 --- a/manual/codes/Object relational mapping - Relations - Foreign key associations - Tree structure.php +++ b/manual/codes/Object relational mapping - Relations - Foreign key associations - Tree structure.php @@ -1,12 +1,12 @@ hasOne("Task as Parent","Task.parent_id"); - $this->hasMany("Task as Subtask","Subtask.parent_id"); + $this->hasOne('Task as Parent','Task.parent_id'); + $this->hasMany('Task as Subtask','Subtask.parent_id'); } public function setTableDefinition() { - $this->hasColumn("name","string",100); - $this->hasColumn("parent_id","integer"); + $this->hasColumn('name','string',100); + $this->hasColumn('parent_id','integer'); } } ?> diff --git a/manual/codes/Object relational mapping - Relations - Inheritance - One table many classes.php b/manual/codes/Object relational mapping - Relations - Inheritance - One table many classes.php index 543972352..f7911739a 100644 --- a/manual/codes/Object relational mapping - Relations - Inheritance - One table many classes.php +++ b/manual/codes/Object relational mapping - Relations - Inheritance - One table many classes.php @@ -1,10 +1,10 @@ hasColumn("name","string",30); - $this->hasColumn("username","string",20); - $this->hasColumn("password","string",16); - $this->hasColumn("created","integer",11); + $this->hasColumn('name','string',30); + $this->hasColumn('username','string',20); + $this->hasColumn('password','string',16); + $this->hasColumn('created','integer',11); } } diff --git a/manual/codes/Object relational mapping - Relations - Inheritance - One table one class.php b/manual/codes/Object relational mapping - Relations - Inheritance - One table one class.php index a93adeb92..7f1895f10 100644 --- a/manual/codes/Object relational mapping - Relations - Inheritance - One table one class.php +++ b/manual/codes/Object relational mapping - Relations - Inheritance - One table one class.php @@ -1,10 +1,10 @@ hasColumn("name","string",30); - $this->hasColumn("username","string",20); - $this->hasColumn("password","string",16); - $this->hasColumn("created","integer",11); + $this->hasColumn('name','string',30); + $this->hasColumn('username','string',20); + $this->hasColumn('password','string',16); + $this->hasColumn('created','integer',11); } } diff --git a/manual/codes/Object relational mapping - Relations - Join table associations - Many-to-Many.php b/manual/codes/Object relational mapping - Relations - Join table associations - Many-to-Many.php index 9001f7b05..8593fa7d0 100644 --- a/manual/codes/Object relational mapping - Relations - Join table associations - Many-to-Many.php +++ b/manual/codes/Object relational mapping - Relations - Join table associations - Many-to-Many.php @@ -1,26 +1,26 @@ hasMany("Group","Groupuser.group_id"); + $this->hasMany('Group','Groupuser.group_id'); } public function setTableDefinition() { - $this->hasColumn("name","string",30); + $this->hasColumn('name','string',30); } } class Group extends Doctrine_Record { public function setUp() { - $this->hasMany("User","Groupuser.user_id"); + $this->hasMany('User','Groupuser.user_id'); } public function setTableDefinition() { - $this->hasColumn("name","string",30); + $this->hasColumn('name','string',30); } } class Groupuser extends Doctrine_Record { public function setTableDefinition() { - $this->hasColumn("user_id","integer"); - $this->hasColumn("group_id","integer"); + $this->hasColumn('user_id','integer'); + $this->hasColumn('group_id','integer'); } } @@ -28,9 +28,9 @@ class Groupuser extends Doctrine_Record { $user = new User(); // add two groups -$user->Group[0]->name = "First Group"; +$user->Group[0]->name = 'First Group'; -$user->Group[1]->name = "Second Group"; +$user->Group[1]->name = 'Second Group'; // save changes into database $user->save(); @@ -39,11 +39,11 @@ $user->save(); $user->Groupuser->delete(); -$groups = new Doctrine_Collection($conn->getTable("Group")); +$groups = new Doctrine_Collection($conn->getTable('Group')); -$groups[0]->name = "Third Group"; +$groups[0]->name = 'Third Group'; -$groups[1]->name = "Fourth Group"; +$groups[1]->name = 'Fourth Group'; $user->Group[2] = $groups[0]; // $user will now have 3 groups diff --git a/manual/codes/Object relational mapping - Relations - Join table associations - Self-referencing.php b/manual/codes/Object relational mapping - Relations - Join table associations - Self-referencing.php index 57fdcd0c3..3a441dcda 100644 --- a/manual/codes/Object relational mapping - Relations - Join table associations - Self-referencing.php +++ b/manual/codes/Object relational mapping - Relations - Join table associations - Self-referencing.php @@ -1,16 +1,16 @@ hasMany("User as Friend","UserReference.user_id-user_id2"); + $this->hasMany('User as Friend','UserReference.user_id-user_id2'); } public function setTableDefinition() { - $this->hasColumn("name","string",30); + $this->hasColumn('name','string',30); } } class UserReference extends Doctrine_Record { public function setTableDefinition() { - $this->hasColumn("user_id","integer"); - $this->hasColumn("user_id2","integer"); + $this->hasColumn('user_id','integer'); + $this->hasColumn('user_id2','integer'); } } ?> diff --git a/manual/codes/Object relational mapping - Relations - Relation aliases.php b/manual/codes/Object relational mapping - Relations - Relation aliases.php index e2ce4c75d..52cfb981d 100644 --- a/manual/codes/Object relational mapping - Relations - Relation aliases.php +++ b/manual/codes/Object relational mapping - Relations - Relation aliases.php @@ -1,24 +1,24 @@ hasColumn("name", "string", 100); - $this->hasColumn("description", "string", 5000); + $this->hasColumn('name', 'string', 100); + $this->hasColumn('description', 'string', 5000); } public function setUp() { // notice the 'as' keyword here - $this->ownsMany("Forum_Thread as Threads", "Forum_Thread.board_id"); + $this->ownsMany('Forum_Thread as Threads', 'Forum_Thread.board_id'); } } class Forum_Thread extends Doctrine_Record { public function setTableDefinition() { - $this->hasColumn("board_id", "integer", 10); - $this->hasColumn("updated", "integer", 10); - $this->hasColumn("closed", "integer", 1); + $this->hasColumn('board_id', 'integer', 10); + $this->hasColumn('updated', 'integer', 10); + $this->hasColumn('closed', 'integer', 1); } public function setUp() { // notice the 'as' keyword here - $this->hasOne("Forum_Board as Board", "Forum_Thread.board_id"); + $this->hasOne('Forum_Board as Board', 'Forum_Thread.board_id'); } } $board = new Board(); diff --git a/manual/codes/Working with objects - Component overview - Connection - Flushing the connection.php b/manual/codes/Working with objects - Component overview - Connection - Flushing the connection.php index 37480533b..f5f99e967 100644 --- a/manual/codes/Working with objects - Component overview - Connection - Flushing the connection.php +++ b/manual/codes/Working with objects - Component overview - Connection - Flushing the connection.php @@ -1,9 +1,9 @@ name = "Jack"; +$user->name = 'Jack'; -$group = $conn->create("Group"); -$group->name = "Drinking Club"; +$group = $conn->create('Group'); +$group->name = 'Drinking Club'; // saves all the changed objects into database diff --git a/manual/codes/Working with objects - Component overview - Connection - Getting a table object.php b/manual/codes/Working with objects - Component overview - Connection - Getting a table object.php index a2f3db549..ea9e6e48e 100644 --- a/manual/codes/Working with objects - Component overview - Connection - Getting a table object.php +++ b/manual/codes/Working with objects - Component overview - Connection - Getting a table object.php @@ -3,9 +3,9 @@ $manager = Doctrine_Manager::getInstance(); // open new connection -$conn = $manager->openConnection(new PDO("dsn","username","password")); +$conn = $manager->openConnection(new PDO('dsn','username','password')); // getting a table object -$table = $conn->getTable("User"); +$table = $conn->getTable('User'); ?> diff --git a/manual/codes/Working with objects - Component overview - Connection - Querying the database.php b/manual/codes/Working with objects - Component overview - Connection - Querying the database.php index 2a493abc3..531c6fdce 100644 --- a/manual/codes/Working with objects - Component overview - Connection - Querying the database.php +++ b/manual/codes/Working with objects - Component overview - Connection - Querying the database.php @@ -2,7 +2,7 @@ // select all users -$users = $conn->query("FROM User"); +$users = $conn->query('FROM User'); // select all users where user email is jackdaniels@drinkmore.info @@ -10,5 +10,5 @@ $users = $conn->query("FROM User WHERE User.Email.address = 'jackdaniels@drinkmo // using prepared statements -$users = $conn->query("FROM User WHERE User.name = ?", array('Jack')); +$users = $conn->query('FROM User WHERE User.name = ?', array('Jack')); ?> diff --git a/manual/codes/Working with objects - Component overview - Manager - Managing connections.php b/manual/codes/Working with objects - Component overview - Manager - Managing connections.php index e5d2a1203..80e1a920f 100644 --- a/manual/codes/Working with objects - Component overview - Manager - Managing connections.php +++ b/manual/codes/Working with objects - Component overview - Manager - Managing connections.php @@ -5,15 +5,15 @@ $manager = Doctrine_Manager::getInstance(); // open first connection -$conn = $manager->openConnection(new PDO("dsn","username","password"), "connection 1"); +$conn = $manager->openConnection(new PDO('dsn','username','password'), 'connection 1'); // open second connection -$conn2 = $manager->openConnection(new PDO("dsn2","username2","password2"), "connection 2"); +$conn2 = $manager->openConnection(new PDO('dsn2','username2','password2'), 'connection 2'); $manager->getCurrentConnection(); // $conn2 -$manager->setCurrentConnection("connection 1"); +$manager->setCurrentConnection('connection 1'); $manager->getCurrentConnection(); // $conn diff --git a/manual/codes/Working with objects - Component overview - Manager - Opening a new connection.php b/manual/codes/Working with objects - Component overview - Manager - Opening a new connection.php index 225c07dab..98f417c46 100644 --- a/manual/codes/Working with objects - Component overview - Manager - Opening a new connection.php +++ b/manual/codes/Working with objects - Component overview - Manager - Opening a new connection.php @@ -6,13 +6,13 @@ $manager = Doctrine_Manager::getInstance(); // Doctrine_Connection // a script may have multiple open connections // (= multiple database connections) -$dbh = new PDO("dsn","username","password"); +$dbh = new PDO('dsn','username','password'); $conn = $manager->openConnection(); // or if you want to use Doctrine Doctrine_Db and its // performance monitoring capabilities -$dsn = "schema://username:password@dsn/dbname"; -$dbh = Doctrine_Db::getConnection($dsn); +$dsn = 'schema://username:password@dsn/dbname'; +$dbh = Doctrine_Db::getConnection($dsn); $conn = $manager->openConnection(); ?> diff --git a/manual/codes/Working with objects - Dealing with relations - Creating related records.php b/manual/codes/Working with objects - Dealing with relations - Creating related records.php index 03c7edcc9..edb3ab559 100644 --- a/manual/codes/Working with objects - Dealing with relations - Creating related records.php +++ b/manual/codes/Working with objects - Dealing with relations - Creating related records.php @@ -2,13 +2,13 @@ // NOTE: related record have always the first letter in uppercase $email = $user->Email; -$email->address = "jackdaniels@drinkmore.info"; +$email->address = 'jackdaniels@drinkmore.info'; $user->save(); // alternative: -$user->Email->address = "jackdaniels@drinkmore.info"; +$user->Email->address = 'jackdaniels@drinkmore.info'; $user->save(); ?> diff --git a/manual/codes/Working with objects - Dealing with relations - Retrieving related records.php b/manual/codes/Working with objects - Dealing with relations - Retrieving related records.php index d2d9d7511..0fe75cee5 100644 --- a/manual/codes/Working with objects - Dealing with relations - Retrieving related records.php +++ b/manual/codes/Working with objects - Dealing with relations - Retrieving related records.php @@ -1,7 +1,7 @@ Email["address"]; +print $user->Email['address']; print $user->Phonenumber[0]->phonenumber; -print $user->Group[0]->get("name"); +print $user->Group[0]->name; ?> diff --git a/manual/codes/Working with objects - Dealing with relations - Updating related records.php b/manual/codes/Working with objects - Dealing with relations - Updating related records.php index 6df14cb1a..66f928bdf 100644 --- a/manual/codes/Working with objects - Dealing with relations - Updating related records.php +++ b/manual/codes/Working with objects - Dealing with relations - Updating related records.php @@ -1,7 +1,7 @@ Email["address"] = "koskenkorva@drinkmore.info"; +$user->Email['address'] = 'koskenkorva@drinkmore.info'; -$user->Phonenumber[0]->phonenumber = "123123"; +$user->Phonenumber[0]->phonenumber = '123123'; $user->save(); diff --git a/manual/docs/Object relational mapping - Introduction.php b/manual/docs/Object relational mapping - Introduction.php index 1dbd9dd27..c33bd8bdd 100644 --- a/manual/docs/Object relational mapping - Introduction.php +++ b/manual/docs/Object relational mapping - Introduction.php @@ -1,7 +1,41 @@ -Setting up a table definition in doctrine is done by using hasColumn method calls inside setTableDefinition method. -Doctrine_Record::hasColumn() takes 4 arguments:
+Doctrine_Record::hasColumn() takes 4 arguments: -1. [column name]
-2. [column type]
-3. [column length]
-4. [column constraints and validators] +# **column name** +# **column type** +# **column length** +# **column constraints and validators** + + +class Email extends Doctrine_Record { + public function setTableDefinition() { + // setting custom table name: + $this->setTableName('emails'); + + $this->hasColumn('address', // name of the column + 'string', // column type + '200', // column length + array('notblank' => true, + 'email' => true // validators / constraints + ) + ); + + + $this->hasColumn('address2', // name of the column + 'string', // column type + '200', // column length + // validators / constraints without arguments can be + // specified also as as string with | separator + 'notblank|email' + ); + + // Doctrine even supports the following format for + // validators / constraints which have no arguments: + + $this->hasColumn('address3', // name of the column + 'string', // column type + '200', // column length + array('notblank', 'email') + ); + } +} + diff --git a/manual/docs/Object relational mapping - Relations - Inheritance - Column aggregation.php b/manual/docs/Object relational mapping - Relations - Inheritance - Column aggregation.php index ee7969fe3..9a5a43152 100644 --- a/manual/docs/Object relational mapping - Relations - Inheritance - Column aggregation.php +++ b/manual/docs/Object relational mapping - Relations - Inheritance - Column aggregation.php @@ -4,83 +4,83 @@ The entity table has a column called 'type' which tells whether an entity is a g The only thing we have to do is to create 3 records (the same as before) and add call the Doctrine_Table::setInheritanceMap() method inside the setUp() method. - + class Entity extends Doctrine_Record { public function setTableDefinition() { - $this->hasColumn("name","string",30); - $this->hasColumn("username","string",20); - $this->hasColumn("password","string",16); - $this->hasColumn("created","integer",11); + $this->hasColumn('name','string',30); + $this->hasColumn('username','string',20); + $this->hasColumn('password','string',16); + $this->hasColumn('created','integer',11); // this column is used for column // aggregation inheritance - $this->hasColumn("type", "integer", 11); + $this->hasColumn('type', 'integer', 11); } } class User extends Entity { public function setUp() { - $this->setInheritanceMap(array("type"=>1)); + $this->setInheritanceMap(array('type'=>1)); } } class Group extends Entity { public function setUp() { - $this->setInheritanceMap(array("type"=>2)); + $this->setInheritanceMap(array('type'=>2)); } } If we want to be able to fetch a record from the Entity table and automatically get a User record if the Entity we fetched is a user we have to do set the subclasses option in the parent class. The adjusted example: - + class Entity extends Doctrine_Record { public function setTableDefinition() { - $this->hasColumn("name","string",30); - $this->hasColumn("username","string",20); - $this->hasColumn("password","string",16); - $this->hasColumn("created","integer",11); + $this->hasColumn('name','string',30); + $this->hasColumn('username','string',20); + $this->hasColumn('password','string',16); + $this->hasColumn('created','integer',11); // this column is used for column // aggregation inheritance - $this->hasColumn("type", "integer", 11); - $this->option("subclasses", array("User", "Group"); + $this->hasColumn('type', 'integer', 11); + $this->option('subclasses', array('User', 'Group'); } } class User extends Entity { public function setUp() { - $this->setInheritanceMap(array("type"=>1)); + $this->setInheritanceMap(array('type'=>1)); } } class Group extends Entity { public function setUp() { - $this->setInheritanceMap(array("type"=>2)); + $this->setInheritanceMap(array('type'=>2)); } } We can then do the following given the previous table mapping. - + $user = new User(); -$user->name="Bjarte S. Karlsen"; -$user->username="meus"; -$user->password="rat"; +$user->name='Bjarte S. Karlsen'; +$user->username='meus'; +$user->password='rat'; $user->save(); $group = new Group(); -$group->name="Users"; -$group->username="users"; -$group->password="password"; +$group->name='Users'; +$group->username='users'; +$group->password='password'; $group->save(); $q = Doctrine_Query(); -$user = $q->from("Entity")->where("id=?")->execute(array($user->id))->getFirst(); +$user = $q->from('Entity')->where('id=?')->execute(array($user->id))->getFirst(); $q = Doctrine_Query(); -$group = $q->from("Entity")->where("id=?")->execute(array($group->id))->getFirst(); +$group = $q->from('Entity')->where('id=?')->execute(array($group->id))->getFirst(); The user object is here an instance of User while the group object is an instance of Group.