Changeset 1066

Timestamp:

11/26/07 16:55:12 (11 months ago)

Author:

mikey

Message:

implemented enhancement #101: stubDatabaseSerializer must support direct insert/update

Files:

• trunk/src/main/php/net/stubbles/rdbms/persistence/serializer/stubDatabaseSerializer.php (modified) (8 diffs)
• trunk/src/test/php/net/stubbles/rdbms/persistence/serializer/stubDatabaseSerializerTestCase.php (modified) (3 diffs)

trunk/src/main/php/net/stubbles/rdbms/persistence/serializer/stubDatabaseSerializer.php

@@ -85 +85 @@
-
-    /**
-serialize
+insert
-     *
-     * @param   object                           $entity
@@ -92 +92 @@
-     * @throws  stubPersistenceException
-     */
-serialize
+insert
-    {
-        if (is_object($entity) === false) {
@@ -103 +103 @@
-        }
-        
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        foreach ($methods as $method) {
-            $column = $this->getTableColumn($method);
@@ -120 +212 @@
-            
-            if ($column->isPrimaryKey() === true) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                } else {
-                    $tableRow->addCriterion(new stubEqualCriterion($column->getName(), $value, $tableRow->getTableName()));
@@ -148 +239 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-     *
-     * @param   stubDatabaseTableRow  $tableRow
+     * @param   object                $entity
-     * @param   array                 $defaultValues
-,string
-
-
-
+
+stubDatabaseSerializerException
+
+Insert
-    {
-        $queryBuilder = stubDatabaseQueryBuilderFactory::create($this->connection);
-        try {
-            // criterion for update exists => update
-            if ($tableRow->hasCriterion() === true) {
-                // set any null values
-                foreach ($defaultValues as $defaultValue) {
-                    $tableRow->setColumn($defaultValue['column'], $defaultValue['value']);
-                }
-                
-                return $queryBuilder->createUpdate(array($tableRow->getTableName() => $tableRow));
-            }
-            
-            // fill default values into entity and table row
-            foreach ($defaultValues as $defaultValue) {
@@ -192 +271 @@
-
-    /**
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     *
-     * @param   array<string,string>   $queries           list of queries to process
@@ -199 +300 @@
-     * @throws  stubDatabaseException
-     */
-
+Insert
-    {
-        foreach ($queries as $tableName => $query) {
@@ -210 +311 @@
-
-    /**
+     * process update queries
+     *
+     * @param   array<string,string>   $queries           list of queries to process
+     * @param   object                 $entity            the entity to process the queries for
+     * @param   array<string,string>   $singlePrimaryKey  optional  information about the single primary key
+     * @throws  stubDatabaseException
+     */
+    protected function processUpdateQueries(array $queries)
+    {
+        foreach ($queries as $tableName => $query) {
+            $this->connection->exec($query);
+        }
+    }
+
+    /**
-     * returns a unique hash code for the class
-     * 

trunk/src/test/php/net/stubbles/rdbms/persistence/serializer/stubDatabaseSerializerTestCase.php

@@ -100 +100 @@
-     * check that a non-object throws an exception
-     */
+    public function testInsertNonObject()
+    {
+        $this->expectException('stubIllegalArgumentException');
+        $this->dbSerializer->insert('foo');
+    }
+
+    /**
+     * test that trying to find a class that does not have an entity annotation throws an exception
+     */
+    public function testInsertNonEntity()
+    {
+        $this->expectException('stubPersistenceException');
+        $this->dbSerializer->insert(new MockNoEntityAnnotationEntity());
+    }
+
+    /**
+     * check that a non-object throws an exception
+     */
+    public function testUpdateNonObject()
+    {
+        $this->expectException('stubIllegalArgumentException');
+        $this->dbSerializer->update('foo');
+    }
+
+    /**
+     * test that trying to find a class that does not have an entity annotation throws an exception
+     */
+    public function testUpdateNonEntity()
+    {
+        $this->expectException('stubPersistenceException');
+        $this->dbSerializer->update(new MockNoEntityAnnotationEntity());
+    }
+
+    /**
+     * check that a non-object throws an exception
+     */
-    public function testSerializeNonObject()
-    {
@@ -119 +155 @@
-     */
-    public function testInsertWithSinglePrimaryKey()
+    {
+        $singlePrimaryKeyEntity = new MockSinglePrimaryKeyEntity();
+        $this->mockConnection->setReturnValue('getLastInsertId', 'mockId');
+        $this->mockConnection->expectCallcount('exec', 1);
+        $this->mockQueryBuilder->setInsertQueries(array('foo' => 'foo'));
+        $this->assertEqual($this->dbSerializer->insert($singlePrimaryKeyEntity), stubDatabaseSerializer::INSERT);
+        $this->assertEqual($this->mockQueryBuilder->getCallCount('createInsert'), 1);
+        $this->assertEqual($this->mockQueryBuilder->getCallCount('createUpdate'), 0);
+        $tableRows = $this->mockQueryBuilder->getInsertTableRows();
+        $this->assertEqual(count($tableRows), 1);
+        $this->assertTrue(isset($tableRows['foo']));
+        $this->assertEqual($singlePrimaryKeyEntity->getId(), 'mockId');
+        $this->assertEqual($tableRows['foo']->getColumns(), array('bar' => 'this is bar', 'default' => 'example'));
+        $this->assertFalse($tableRows['foo']->hasCriterion());
+    }
+
+    /**
+     * test insert with a single primary key
+     */
+    public function testInsertWithSinglePrimaryKeyAlreadySet()
+    {
+        $singlePrimaryKeyEntity = new MockSinglePrimaryKeyEntity();
+        $singlePrimaryKeyEntity->setId('mockId');
+        $this->mockConnection->expectNever('getLastInsertId');
+        $this->mockConnection->expectCallcount('exec', 1);
+        $this->mockQueryBuilder->setInsertQueries(array('foo' => 'foo'));
+        $this->assertEqual($this->dbSerializer->insert($singlePrimaryKeyEntity), stubDatabaseSerializer::INSERT);
+        $this->assertEqual($this->mockQueryBuilder->getCallCount('createInsert'), 1);
+        $this->assertEqual($this->mockQueryBuilder->getCallCount('createUpdate'), 0);
+        $tableRows = $this->mockQueryBuilder->getInsertTableRows();
+        $this->assertEqual(count($tableRows), 1);
+        $this->assertTrue(isset($tableRows['foo']));
+        $this->assertEqual($singlePrimaryKeyEntity->getId(), 'mockId');
+        $this->assertEqual($tableRows['foo']->getColumns(), array('id' => 'mockId', 'bar' => 'this is bar', 'default' => 'example'));
+        $this->assertFalse($tableRows['foo']->hasCriterion());
+    }
+
+    /**
+     * test update with a single primary key
+     */
+    public function testUpdateWithSinglePrimaryKey()
+    {
+        $singlePrimaryKeyEntity = new MockSinglePrimaryKeyEntity();
+        $singlePrimaryKeyEntity->setId('mockId');
+        $singlePrimaryKeyEntity->setDefaultValue('anotherExample');
+        $this->mockConnection->expectNever('getLastInsertId');
+        $this->mockConnection->expectCallcount('exec', 1);
+        $this->mockQueryBuilder->setUpdateQueries(array('foo' => 'foo'));
+        $this->assertEqual($this->dbSerializer->update($singlePrimaryKeyEntity), stubDatabaseSerializer::UPDATE);
+        $this->assertEqual($this->mockQueryBuilder->getCallCount('createInsert'), 0);
+        $this->assertEqual($this->mockQueryBuilder->getCallCount('createUpdate'), 1);
+        $tableRows = $this->mockQueryBuilder->getUpdateTableRows();
+        $this->assertEqual(count($tableRows), 1);
+        $this->assertTrue(isset($tableRows['foo']));
+        $this->assertEqual($singlePrimaryKeyEntity->getId(), 'mockId');
+        $this->assertEqual($tableRows['foo']->getColumns(), array('bar' => 'this is bar', 'default' => 'anotherExample'));
+        $this->assertTrue($tableRows['foo']->hasCriterion());
+        $this->assertEqual($tableRows['foo']->getCriterion()->toSQL(), "(`foo`.`id` = 'mockId')");
+    }
+
+    /**
+     * test insert with a single primary key
+     */
+    public function testSerializeInsertWithSinglePrimaryKey()
-    {
-        $singlePrimaryKeyEntity = new MockSinglePrimaryKeyEntity();
@@ -138 +238 @@
-     * test update with a single primary key
-     */
-
+Serialize
-    {
-        $singlePrimaryKeyEntity = new MockSinglePrimaryKeyEntity();