changed the way to specify active record table.

10 files changed, 30 insertions, 30 deletions

diff --git a/demos/address-book/protected/pages/AddressRecord.php b/demos/address-book/protected/pages/AddressRecord.php
index 55c4ba06..aaf8db7c 100644
--- a/demos/address-book/protected/pages/AddressRecord.php
+++ b/demos/address-book/protected/pages/AddressRecord.php
@@ -4,7 +4,7 @@
  */

 class AddressRecord extends TActiveRecord

 {

-	public static $_tablename='addresses';

+	const TABLE='addresses';

 

 	/**

 	 * @var integer $id

diff --git a/demos/chat/protected/App_Code/ChatBufferRecord.php b/demos/chat/protected/App_Code/ChatBufferRecord.php
index 03f94704..f4d53db0 100644
--- a/demos/chat/protected/App_Code/ChatBufferRecord.php
+++ b/demos/chat/protected/App_Code/ChatBufferRecord.php
@@ -2,14 +2,14 @@
 

 class ChatBufferRecord extends TActiveRecord

 {

+	const TABLE='chat_buffer';

+

 	public $id;

 	public $for_user;

 	public $from_user;

 	public $message;

 	private $_created_on;

 

-	public static $_tablename='chat_buffer';

-

 	public function getCreated_On()

 	{

 		if($this->_created_on === null)

diff --git a/demos/chat/protected/App_Code/ChatUserRecord.php b/demos/chat/protected/App_Code/ChatUserRecord.php
index e5ebc761..b68fbd4d 100644
--- a/demos/chat/protected/App_Code/ChatUserRecord.php
+++ b/demos/chat/protected/App_Code/ChatUserRecord.php
@@ -2,11 +2,11 @@
 

 class ChatUserRecord extends TActiveRecord

 {

+	const TABLE='chat_users';

+

 	public $username;

 	private $_last_activity;

 

-	public static $_tablename='chat_users';

-

 	public function getLast_Activity()

 	{

 		if($this->_last_activity === null)

diff --git a/demos/quickstart/protected/controls/Comments/CommentBlock.php b/demos/quickstart/protected/controls/Comments/CommentBlock.php
index b0f23d47..9c008491 100644
--- a/demos/quickstart/protected/controls/Comments/CommentBlock.php
+++ b/demos/quickstart/protected/controls/Comments/CommentBlock.php
@@ -10,6 +10,8 @@ $manager->setDbConnection($db);
 

 class CommentRecord extends TActiveRecord

 {

+	const TABLE='qs_comments';

+

 	public $id;

 	public $username;

 	public $date_added;

@@ -17,8 +19,6 @@ class CommentRecord extends TActiveRecord
 	public $block_id;

 	public $content;

 

-	public static $_tablename='qs_comments';

-

 	public static function finder($className=__CLASS__)

 	{

 		return parent::finder($className);

diff --git a/demos/quickstart/protected/pages/Database/ActiveRecord.page b/demos/quickstart/protected/pages/Database/ActiveRecord.page
index 041a1126..0a8d6580 100644
--- a/demos/quickstart/protected/pages/Database/ActiveRecord.page
+++ b/demos/quickstart/protected/pages/Database/ActiveRecord.page
@@ -73,11 +73,11 @@ CREATE TABLE users
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code_690148">
 class UserRecord extends TActiveRecord
 {
+    const TABLE='users'; //table name 
+
     public $username; //the column named "username" in the "users" table
     public $email;
     
-    public static $_tablename='users'; //table name 
-    
     /**
      * @return TActiveRecord active record finder instance
      */
@@ -89,15 +89,15 @@ class UserRecord extends TActiveRecord
 </com:TTextHighlighter>
 </p>
 <p id="690485" class="block-content">Each property of the <tt>UserRecord</tt> class must correspond to a
-    column with the same name in the "users" table. The static class variable
-    <tt>$_tablename</tt> (must be public) is optional when the class name is the same as
-    the table name in the database, otherwise <tt>$_tablename</tt> must
+    column with the same name in the "users" table. The class constant
+    <tt>TABLE</tt> is optional when the class name is the same as
+    the table name in the database, otherwise <tt>TABLE</tt> must
     specify the table name that corresponds to your Active Record class.
 </p>
 
 <div class="note"><b class="note">Note:</b>
-You may need to quote (specific to your database) the value of the <tt>$_tablename</tt>. 
-E.g. MySQL uses back-ticks, <tt>$_tablename = "`database1`.`table1`"</tt>
+You may need to quote (specific to your database) the value of the <tt>TABLE</tt>. 
+E.g. MySQL uses back-ticks, <tt>TABLE = "`database1`.`table1`"</tt>
 </div>
 
 <p class="block-content" id="ar_as_component">
@@ -120,7 +120,7 @@ class UserRecord extends TActiveRecord {
 </com:TTextHighlighter>
 
 <div class="info"><b class="note">Info:</b>
-<tt>TActiveRecord</tt> can also work with database views by specifying the value <tt>$_tablename</tt>
+<tt>TActiveRecord</tt> can also work with database views by specifying the constant <tt>TABLE</tt>
 corresponding to the view name. However, objects returned
 from views are read-only, calling the <tt>save()</tt> or <tt>delete()</tt> method
 will raise an exception. 
diff --git a/demos/quickstart/protected/pages/Database/Samples/Scaffold/Home.php b/demos/quickstart/protected/pages/Database/Samples/Scaffold/Home.php
index 9bfe3f6d..45d72f1f 100644
--- a/demos/quickstart/protected/pages/Database/Samples/Scaffold/Home.php
+++ b/demos/quickstart/protected/pages/Database/Samples/Scaffold/Home.php
@@ -5,12 +5,12 @@ Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldView');
 

 class AddressRecord extends TActiveRecord

 {

+	const TABLE='addresses';

+

 	public $id;

 	public $username;

 	public $phone;

 

-	public static $_tablename='addresses';

-

 	//for demo, we use static db here

 	//otherwise we should use TActiveRecordConfig in application.xml

 	private static $_db;

diff --git a/demos/quickstart/protected/pages/Database/Scaffold.page b/demos/quickstart/protected/pages/Database/Scaffold.page
index 36a0ec21..055cac26 100644
--- a/demos/quickstart/protected/pages/Database/Scaffold.page
+++ b/demos/quickstart/protected/pages/Database/Scaffold.page
@@ -39,10 +39,10 @@ table as defined in the <a href="?page=Database.ActiveRecord">Active Record</a>
 <com:TTextHighlighter Language="php" CssClass="source">

 class UserRecord extends TActiveRecord

 {

+	const TABLE='users';

+	

     public $username;

     public $email;

-    

-    public static $_tablename='users';

 }

 </com:TTextHighlighter>

 

diff --git a/demos/quickstart/protected/pages/Database/SqlMap.page b/demos/quickstart/protected/pages/Database/SqlMap.page
index c8ced852..a4082527 100644
--- a/demos/quickstart/protected/pages/Database/SqlMap.page
+++ b/demos/quickstart/protected/pages/Database/SqlMap.page
@@ -213,11 +213,11 @@ $user = $sqlmap->queryForObject("SelectUsers");
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code_700173">
 class UserRecord extends TActiveRecord
 {
+	const TABLE='users'; //table name 
+
     public $username; //the column named "username" in the "users" table
     public $email;
-    
-    private static $_tablename='users'; //table name 
-    
+        
     /**
      * @return TActiveRecord active record finder instance
      */
diff --git a/demos/quickstart/protected/pages/Tutorial/AjaxChat.page b/demos/quickstart/protected/pages/Tutorial/AjaxChat.page
index 7d978a12..4e40b33a 100644
--- a/demos/quickstart/protected/pages/Tutorial/AjaxChat.page
+++ b/demos/quickstart/protected/pages/Tutorial/AjaxChat.page
@@ -168,11 +168,11 @@ as <tt>App_Code/chat.db</tt>.
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code_90033">
 class ChatUserRecord extends TActiveRecord
 {
+    const TABLE='chat_users';
+    
     public $username;
     public $last_activity;
 
-    public static $_tablename='chat_users';
-
     public static function finder($className=__CLASS__)
     {
         return parent::finder($className);
@@ -502,14 +502,14 @@ The corresponding <tt>ChatBufferRecord</tt> class is saved as
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code_90045">
 class ChatBufferRecord extends TActiveRecord
 {
+	const TABLE='chat_buffer';
+
     public $id;
     public $for_user;
     public $from_user;
     public $message;
     private $_created_on;
 
-    public static $_tablename='chat_buffer';
-
     public function getCreated_On()
     {
         if($this->_created_on === null)
diff --git a/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page b/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page
index 7bc36d5f..24c5ea76 100644
--- a/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page
+++ b/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page
@@ -168,11 +168,11 @@ as <tt>App_Code/chat.db</tt>.
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code_90033">
 class ChatUserRecord extends TActiveRecord
 {
+	const TABLE='chat_users';
+
     public $username;
     public $last_activity;
 
-    public static $_tablename='chat_users';
-
     public static function finder($className=__CLASS__)
     {
         return parent::finder($className);
@@ -502,14 +502,14 @@ The corresponding <tt>ChatBufferRecord</tt> class is saved as
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code_90045">
 class ChatBufferRecord extends TActiveRecord
 {
+	const TABLE='chat_buffer';
+
     public $id;
     public $for_user;
     public $from_user;
     public $message;
     private $_created_on;
 
-    public static $_tablename='chat_buffer';
-
     public function getCreated_On()
     {
         if($this->_created_on === null)