5 files changed, 173 insertions, 8 deletions
diff --git a/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php b/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php
index b02de3de..b0d7ccf4 100644
--- a/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php
+++ b/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php
@@ -1,5 +1,4 @@
-<?php
-
+<?php
 Prado::using('System.Data.ActiveRecord.TActiveRecord');
 require_once(dirname(__FILE__).'/records/Blogs.php');
 
@@ -7,7 +6,7 @@ class ActiveRecordMySql5TestCase extends UnitTestCase
 {
 	function setup()
 	{
-		$conn = new TDbConnection('mysql:host=localhost;dbname=ar_test', 'test','test');
+		$conn = new TDbConnection('mysql:host=localhost;dbname=ar_test;port=3307', 'test5','test5');
 		TActiveRecordManager::getInstance()->setDbConnection($conn);
 	}
 
diff --git a/tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php b/tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php
new file mode 100644
index 00000000..6c240b2f
--- /dev/null
+++ b/tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php
@@ -0,0 +1,114 @@
+<?php
+
+Prado::using('System.Data.ActiveRecord.TActiveRecord');
+
+abstract class Mysql4Record extends TActiveRecord
+{
+	protected static $conn;
+
+	public function getDbConnection()
+	{
+		if(self::$conn===null)
+			self::$conn = new TDbConnection('mysql:host=localhost;port=3306;dbname=tests', 'test4', 'test4');
+		return self::$conn;
+	}
+}
+
+class Album extends Mysql4Record
+{
+	public $title;
+
+	public $Tracks = array(self::HAS_MANY, 'Track');
+	public $Artists = array(self::HAS_MANY, 'Artist', 'album_artist');
+
+	public static function finder($class=__CLASS__)
+	{
+		return parent::finder($class);
+	}
+}
+
+class Artist extends Mysql4Record
+{
+	public $name;
+
+	public $Albums = array(self::HAS_MANY, 'Album', 'album_artist');
+
+	public static function finder($class=__CLASS__)
+	{
+		return parent::finder($class);
+	}
+}
+
+class Track extends Mysql4Record
+{
+	public $id;
+	public $song_name;
+	public $album_id; //FK -> Album.id
+
+	public $Album = array(self::BELONGS_TO, 'Album');
+
+	public static function finder($class=__CLASS__)
+	{
+		return parent::finder($class);
+	}
+}
+
+abstract class SqliteRecord extends TActiveRecord
+{
+	protected static $conn;
+
+	public function getDbConnection()
+	{
+		if(self::$conn===null)
+			self::$conn = new TDbConnection('sqlite:'.dirname(__FILE__).'/blog.db');
+		return self::$conn;
+	}
+}
+
+class PostRecord extends SqliteRecord
+{
+	const TABLE='posts';
+	public $post_id;
+	public $author;
+	public $create_time;
+	public $title;
+	public $content;
+	public $status;
+
+	public $authorRecord = array(self::HAS_ONE, 'BlogUserRecord');
+
+	public static function finder($className=__CLASS__)
+	{
+		return parent::finder($className);
+	}
+}
+class BlogUserRecord extends SqliteRecord
+{
+	const TABLE='users';
+	public $username;
+	public $email;
+	public $password;
+	public $role;
+	public $first_name;
+	public $last_name;
+
+	public $posts = array(self::HAS_MANY, 'PostRecord');
+
+	public static function finder($className=__CLASS__)
+	{
+		return parent::finder($className);
+	}
+}
+
+class ForeignKeyTestCase extends UnitTestCase
+{
+	function test()
+	{
+		$album = Album::finder()->withTracks()->findAll();
+		//print_r($album);
+		//print_r(PostRecord::finder()->findAll());
+		//print_r(BlogUserRecord::finder()->with_posts()->findAll());
+	}
+}
+
+?>
+\ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/RecordEventTestCase.php b/tests/simple_unit/ActiveRecord/RecordEventTestCase.php
index fad54eb0..f6009608 100644
--- a/tests/simple_unit/ActiveRecord/RecordEventTestCase.php
+++ b/tests/simple_unit/ActiveRecord/RecordEventTestCase.php
@@ -9,13 +9,13 @@ class RecordEventTestCase extends UnitTestCase
 		$conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test');
 		TActiveRecordManager::getInstance()->setDbConnection($conn);
 	}
-/*
+
 	function testFindByPk()
 	{
 		$user1 = UserRecord::finder()->findByPk('admin');
 		$this->assertNotNull($user1);
 	}
-*/
+
 	function test_same_data_returns_same_object()
 	{
 		$criteria = new TActiveRecordCriteria('username = ?', 'admin');
@@ -23,14 +23,14 @@ class RecordEventTestCase extends UnitTestCase
 		$finder->OnCreateCommand[] = array($this, 'logger');
 		$finder->OnExecuteCommand[] = array($this, 'logger');
 		$user1 = $finder->find($criteria);
-		var_dump($user1);
+		//var_dump($user1);
 
-		var_dump(UserRecord::finder()->find($criteria));
+		//var_dump(UserRecord::finder()->find($criteria));
 	}
 
 	function logger($sender, $param)
 	{
-		var_dump($param);
+		//var_dump($param);
 	}
 }
 
diff --git a/tests/simple_unit/ActiveRecord/blog.db b/tests/simple_unit/ActiveRecord/blog.db
new file mode 100644
index 00000000..30a9cb7a
--- /dev/null
+++ b/tests/simple_unit/ActiveRecord/blog.db
diff --git a/tests/simple_unit/ActiveRecord/mysql4text.sql b/tests/simple_unit/ActiveRecord/mysql4text.sql
new file mode 100644
index 00000000..4d61bc81
--- /dev/null
+++ b/tests/simple_unit/ActiveRecord/mysql4text.sql
@@ -0,0 +1,52 @@
+CREATE TABLE album (
+  title varchar(100) NOT NULL default '',
+  PRIMARY KEY  (title)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE artist (
+  name varchar(25) NOT NULL default '',
+  PRIMARY KEY  (name)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE album_artists (
+  album_title varchar(100) NOT NULL default '',
+  artist_name varchar(25) NOT NULL default '',
+  PRIMARY KEY  (album_title,artist_name),
+  KEY FK_album_artists_2 (artist_name)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE track (
+  id int(11) NOT NULL auto_increment,
+  song_name varchar(200) NOT NULL default '',
+  album_id varchar(100) NOT NULL default '',
+  PRIMARY KEY  (id),
+  KEY album_id (album_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE album_artists
+  ADD CONSTRAINT FK_album_artists_2 FOREIGN KEY (artist_name) REFERENCES artist (name),
+  ADD CONSTRAINT FK_album_artists_1 FOREIGN KEY (album_title) REFERENCES album (title);
+
+ALTER TABLE track
+  ADD CONSTRAINT track_ibfk_1 FOREIGN KEY (album_id) REFERENCES album (title);
+
+
+INSERT INTO album (title) VALUES ('Album 1');
+INSERT INTO album (title) VALUES ('Album 2');
+
+INSERT INTO artist (name) VALUES ('Dan');
+INSERT INTO artist (name) VALUES ('Jenny');
+INSERT INTO artist (name) VALUES ('Karl');
+INSERT INTO artist (name) VALUES ('Tom');
+
+INSERT INTO album_artists (album_title, artist_name) VALUES ('Album 1', 'Dan');
+INSERT INTO album_artists (album_title, artist_name) VALUES ('Album 2', 'Dan');
+INSERT INTO album_artists (album_title, artist_name) VALUES ('Album 1', 'Jenny');
+INSERT INTO album_artists (album_title, artist_name) VALUES ('Album 2', 'Karl');
+INSERT INTO album_artists (album_title, artist_name) VALUES ('Album 2', 'Tom');
+
+INSERT INTO track (id, song_name, album_id) VALUES (1, 'Track 1', 'Album 1');
+INSERT INTO track (id, song_name, album_id) VALUES (2, 'Song 2', 'Album 1');
+INSERT INTO track (id, song_name, album_id) VALUES (3, 'Track A', 'Album 2');
+INSERT INTO track (id, song_name, album_id) VALUES (4, 'Track B', 'Album 2');
+INSERT INTO track (id, song_name, album_id) VALUES (5, 'Song 3', 'Album 1');
+\ No newline at end of file