0
@@ -56,12 +56,12 @@ function &get_user_object()
0
       else
0
       {
0
         //Add validation error about passwords not matching
0
-				$user_object->add_validation_error(lang("Passwords don't match"));
0
+				$user_object->add_error(lang("Passwords don't match"));
0
       }
0
     }
0
     else
0
     {
0
-			$user_object->add_validation_error(lang("No password given"));
0
+			$user_object->add_error(lang("No password given"));
0
     }
0
   }
0
   return $user_object;

0
@@ -56,7 +56,7 @@ function get_user_object($user_id)
0
       else
0
       {
0
         //Add validation error about passwords not matching
0
-				$user_object->add_validation_error(lang("Passwords don't match"));
0
+				$user_object->add_error(lang("Passwords don't match"));
0
       }
0
     }
0
   }

0
@@ -49,7 +49,7 @@ class BlockHtml extends CmsObject
0
   {
0
     if ($page->get_property_value($block_name . '-content', $lang) == '')
0
     {
0
-			$page->add_validation_error(lang('nofieldgiven', array(lang('content'))));	
0
+			$page->add_error(lang('nofieldgiven', array(lang('content'))));	
0
     }
0
   }
0
   

0
@@ -822,7 +822,6 @@ abstract class CmsObjectRelationalMapping extends CmsObject implements ArrayAcce
0
           {
0
             if ($this->params[$localname] instanceof CmsDateTime)
0
             {
0
-							//var_dump($this->params[$localname]);
0
               $midpart .= "{$table}.{$onefield} = " . $this->params[$localname]->to_sql_string() . ", ";
0
             }
0
             else
0
@@ -1391,25 +1390,62 @@ abstract class CmsObjectRelationalMapping extends CmsObject implements ArrayAcce
0
   {
0
     if ($this->$field == null || $this->$field == '')
0
     {
0
-			$this->add_validation_error(($message != '' ? $message : lang('nofieldgiven',array($field))));
0
+			$this->add_validation_error(($message != '' ? $message : lang("%s must not be blank", $this->$field)));
0
+		}
0
+	}
0
+	
0
+	/**
0
+	 * Validation method to see if a parameter has been filled in.  This should
0
+	 * be called from an object's validate() method on each field that needs to be
0
+	 * filled in before it can be saved.
0
+	 *
0
+	 * @param string Name of the field to check
0
+	 * @param string If given, this is the message that will be set in the object if the method didn't succed.
0
+	 * @return void
0
+	 * @author Ted Kulp
0
+	 */
0
+	function validate_numericality_of($field, $message = '')
0
+	{
0
+		if (!($this->$field == null || $this->field != ''))
0
+		{
0
+			if ((string)$this->$field != (string)intval($this->$field) && (string)$this->$field != (string)floatval($this->$field))
0
+			{
0
+				$this->add_validation_error(($message != '' ? $message : lang("%s must be a number", $this->$field)));
0
+			}
0
     }
0
   }
0
   
0
   /**
0
    * Method for quickly adding a new validation error to the object.  If this is
0
-	 * called, then it's a safe bet that save() will fail.
0
+	 * called, then it's a safe bet that save() will fail.  This should only be
0
+	 * used for setting validation errors from external sources.
0
    *
0
    * @param string Message to add to the validation error stack
0
    * @return void
0
    * @author Ted Kulp
0
    */
0
-	function add_validation_error($message)
0
+	public function add_error($message)
0
   {
0
-		$this->validation_errors[] = $message;
0
+		$this->add_validation_error($message);
0
     $this->clear_errors = false;
0
   }
0
   
0
   /**
0
+	 * Method for quickly adding a new validation error to the object.  If this is
0
+	 * called, then it's a safe bet that save() will fail.  This should only be
0
+	 * used for setting validation errors from the object itself, as it doesn't
0
+	 * set the clear_errors flag.
0
+	 *
0
+	 * @param string Message to add to the validation error stack
0
+	 * @return void
0
+	 * @author Ted Kulp
0
+	 */
0
+	protected function add_validation_error($message)
0
+	{
0
+		$this->validation_errors[] = $message;
0
+	}
0
+	
0
+	/**
0
    * Method to call the validation methods properly.
0
    *
0
    * @return int The number of validation errors

0
@@ -32,18 +32,32 @@ class CmsObjectRelationalMappingTest extends PHPUnit_Framework_TestCase
0
       id I KEY AUTO,
0
       test_field C(255),
0
       another_test_field C(255),
0
+			some_int I,
0
+			some_float F,
0
       create_date T,
0
       modified_date T
0
     ");
0
     
0
     $cms_db_prefix = CMS_DB_PREFIX;
0
-		cms_db()->Execute("INSERT INTO {$cms_db_prefix}test_orm_table (test_field, another_test_field, create_date, modified_date) VALUES ('test', 'blah', now() - 10, now() - 10)");
0
+		cms_db()->Execute("INSERT INTO {$cms_db_prefix}test_orm_table (test_field, another_test_field, some_int, some_float, create_date, modified_date) VALUES ('test', 'blah', 5, 5.501, now() - 10, now() - 10)");
0
     cms_db()->Execute("INSERT INTO {$cms_db_prefix}test_orm_table (test_field, create_date, modified_date) VALUES ('test2', now(), now())");
0
     cms_db()->Execute("INSERT INTO {$cms_db_prefix}test_orm_table (test_field, create_date, modified_date) VALUES ('test3', now(), now())");
0
+		
0
+		@CmsDatabase::drop_table('test_orm_table_child');
0
+		CmsDatabase::create_table('test_orm_table_child', "
0
+			id I KEY AUTO,
0
+			parent_id I,
0
+			some_other_field C(255),
0
+			create_date T,
0
+			modified_date T
0
+		");
0
+		
0
+		cms_db()->Execute("INSERT INTO {$cms_db_prefix}test_orm_table_child (parent_id, some_other_field, create_date, modified_date) VALUES (1, 'test', now(), now())");
0
   }
0
   
0
   public function tearDown()
0
   {
0
+		CmsDatabase::drop_table('test_orm_table_child');
0
     CmsDatabase::drop_table('test_orm_table');
0
     CmsCache::clear();
0
   }
0
@@ -57,7 +71,7 @@ class CmsObjectRelationalMappingTest extends PHPUnit_Framework_TestCase
0
   public function testGetColumnsInTableShouldWork()
0
   {
0
     $result = cms_orm('test_orm_table')->get_columns_in_table();
0
-		$this->assertEquals(5, count($result));
0
+		$this->assertEquals(7, count($result));
0
     $this->assertEquals('int', $result['id']->type);
0
     $this->assertEquals('varchar', $result['test_field']->type);
0
     $this->assertEquals('datetime', $result['create_date']->type);
0
@@ -168,12 +182,89 @@ class CmsObjectRelationalMappingTest extends PHPUnit_Framework_TestCase
0
     $this->assertTrue($result->has_parameter('modified_date'));
0
     $this->assertFalse($result->has_parameter('i_made_this_up'));
0
   }
0
+	
0
+	public function testValidatorWillNotAllowSaves()
0
+	{
0
+		$result = cms_orm('test_orm_table')->find();
0
+		$result->test_field = '';
0
+		$result->another_test_field = '';
0
+		$this->assertFalse($result->save());
0
+		$result->test_field = 'test';
0
+		$this->assertFalse($result->save());
0
+		$result->another_test_field = 'blah';
0
+		$this->assertTrue($result->save());
0
+	}
0
+	
0
+	public function testNumericalityOfValidatorShouldActuallyWork()
0
+	{
0
+		$result = cms_orm('test_orm_table')->find();
0
+		$result->some_int = '';  #We're testing numbers, not empty strings -- do another validation
0
+		$this->assertTrue($result->save());
0
+		$result->some_int = '5';
0
+		$this->assertTrue($result->save());
0
+		$result->some_int = 5;
0
+		$this->assertTrue($result->save());
0
+		$result->some_float = 'sdfsdfsdfsfd';
0
+		$this->assertFalse($result->save());
0
+		$result->some_float = '5.501';
0
+		$this->assertTrue($result->save());
0
+		$result->some_float = 5.501;
0
+		$this->assertTrue($result->save());
0
+	}
0
+	
0
+	public function testHasManyShouldWork()
0
+	{
0
+		$result = cms_orm('test_orm_table')->find_by_id(1);
0
+		$this->assertNotNull($result);
0
+		$this->assertEquals(1, count($result->children));
0
+		$this->assertEquals('test', $result->children[0]->some_other_field);
0
+	}
0
+	
0
+	public function testBelongsToShouldWorkAsWell()
0
+	{
0
+		$result = cms_orm('test_orm_table')->find_by_id(1);
0
+		$this->assertNotNull($result);
0
+		$this->assertEquals(1, count($result->children));
0
+		$this->assertNotNull(count($result->children[0]->parent));
0
+		$this->assertEquals(1, $result->children[0]->parent->id);
0
+	}
0
+	
0
+	public function testDeleteShouldActuallyDelete()
0
+	{
0
+		$result = cms_orm('test_orm_table')->find_by_id(1);
0
+		$this->assertNotNull($result);
0
+		$result->delete();
0
+		$result = cms_orm('test_orm_table')->find_all();
0
+		$this->assertEquals(2, count($result));
0
+	}
0
 
0
 }
0
 
0
 class TestOrmTable extends CmsObjectRelationalMapping
0
 {
0
-	
0
+	public function setup()
0
+	{
0
+		$this->create_has_many_association('children', 'TestOrmTableChild', 'parent_id');
0
+	}
0
+
0
+	public function validate()
0
+	{
0
+		$this->validate_not_blank('test_field');
0
+		if (strlen($this->another_test_field) == 0)
0
+		{
0
+			$this->add_validation_error('can\'t be blank');
0
+		}
0
+		$this->validate_numericality_of('some_int');
0
+		$this->validate_numericality_of('some_float');
0
+	}
0
+}
0
+
0
+class TestOrmTableChild extends CmsObjectRelationalMapping
0
+{	
0
+	public function setup()
0
+	{
0
+		$this->create_belongs_to_association('parent', 'test_orm_table', 'parent_id');
0
+	}
0
 }
0
 
0
 # vim:ts=4 sw=4 noet