Merge pull request #86 from piotras/ratatoskr

New test and doc update

docs/midgard_documentor.php

@@ -113,6 +113,44 @@ public static function get_midgard_base_classes()
         return $classes;
     }
 
+    public static function get_midgard_abstract_classes()
+    {
+        $classes = array();
+
+        $all_classes = self::get_classes();
+
+        if (empty($all_classes))
+            return $classes;
+
+        foreach ($all_classes as $refclass)
+        {
+            if ($refclass->isAbstract() === false) {
+                continue;
+            }             
+            $classes[] = $refclass;
+        } 
+        return $classes;
+    }
+
+    public static function get_midgard_interfaces()
+    {
+        $classes = array();
+
+        $all_classes = self::get_classes();
+
+        if (empty($all_classes))
+            return $classes;
+
+        foreach ($all_classes as $refclass)
+        {
+            if ($refclass->isInterface() === false) {
+                continue;
+            }             
+            $classes[] = $refclass;
+        } 
+        return $classes;
+    }
+
     public function create_footer()
     {
 
@@ -133,6 +171,22 @@ public function get_index_buffer()
         {
             $this->add_to_index($refclass);
         }
+
+        $this->index_buffer .= "<h2> Abstract classes </h2>";       
+        $midgard_abstract_classes = self::get_midgard_abstract_classes();
+
+        foreach ($midgard_abstract_classes as $refclass)
+        {
+            $this->add_to_index($refclass);
+        }
+
+        $this->index_buffer .= "<h2> Interfaces </h2>";       
+        $midgard_interfaces = self::get_midgard_interfaces();
+
+        foreach ($midgard_interfaces as $refclass)
+        {
+            $this->add_to_index($refclass);
+        }
 
         $this->index_buffer .= "<h2> Database access classes </h2>";
         $midgard_dbobject_classes = self::get_midgard_dbobject_classes();

phpunit/tests/010_Query/SqlQuerySelectDataConstraintGroupTest.php

@@ -0,0 +1,69 @@
+<?php
+
+class SqlQuerySelectDataConstraintGroupTest extends MidgardTest
+{
+    protected $select = null;
+    protected $mgd = null;
+
+    public function setUp()
+    {
+        $this->mgd = midgard_connection::get_instance();
+
+        if ($this->select === null) {
+            $this->select = new MidgardSqlQuerySelectData(midgard_connection::get_instance());
+        }
+    }
+
+    public function tearDown()
+    {
+        unset($this->select);
+    }
+
+    public function testInheritance()
+    {
+        $cg = new MidgardQueryConstraintGroup("AND");
+        $this->assertInstanceOf("MidgardQueryConstraintSimple", $cg);
+    }
+
+    public function testQueryConstraintGroup()
+    {
+        $storage = new MidgardQueryStorage("midgard_snippet");
+        $columnA = new MidgardSqlQueryColumn(
+            new MidgardQueryProperty("name", $storage),
+            "tbl1",
+            "a"
+        );
+
+        $columnB = new MidgardSqlQueryColumn(
+            new MidgardQueryProperty("code", $storage),
+            "tbl1",
+            "b"
+        );
+
+        $this->select->add_column($columnA);
+        $this->select->add_column($columnB);
+
+        $cg = new MidgardQueryConstraintGroup("AND");
+
+        $cg->add_constraint(
+            new MidgardSqlQueryConstraint(
+                $columnA,
+                "<>",
+                new MidgardQueryValue("")
+            )
+        );
+
+        $cg->add_constraint(
+            new MidgardSqlQueryConstraint(
+                $columnB,
+                "<>",
+                new MidgardQueryValue("")
+            )
+        );
+
+        $this->select->set_constraint($cg);
+        $this->select->execute();
+    }
+}
+
+?>