#014690: Duplicate Code on Save Handler Generator and Re-instantiation on each object

Index: PersistentObject/src/handlers/save_handler.php
===================================================================
--- PersistentObject/src/handlers/save_handler.php (revision 10038)
+++ PersistentObject/src/handlers/save_handler.php (working copy)
@@ -319,21 +339,7 @@
}

// Set up and execute the query.
- $q = $this->database->createInsertQuery();
- $q->insertInto( $this->database->quoteIdentifier( $def->table ) );
- foreach ( $castedState as $name => $value )
- {
- if ( $name !== $def->idProperty->propertyName )
- {
- // Set each of the properties.
- $q->set(
- $this->database->quoteIdentifier(
- $def->properties[$name]->columnName
- ),
- $q->bindValue( $value, null, $def->properties[$name]->databaseType )
- );
- }
- }
+ $q = $this->buildInsertQuery($def, $castedState);

// Atomic operation
$this->database->beginTransaction();
@@ -417,21 +411,81 @@
}

// Set up and execute the query
- $q = $this->database->createUpdateQuery();
- $q->update( $this->database->quoteIdentifier( $def->table ) );
+ $q = $this->buildUpdateQuery($def, $state);
+
+ $this->session->performQuery( $q, true );
+ }
+
+ /**
+ * Build insert query based on a definition and a state.
+ *
+ * @param ezcPersistentObjectDefinition $def
+ * @param array $state
+ * @return ezcQueryInsert
+ */
+ private function buildInsertQuery($def, $state)
+ {
+ $q = $this->database->createInsertQuery();
+ $q->insertInto( $this->database->quoteIdentifier( $def->table ) );
+ $q = $this->bindNonIdPropertyValuesToQuery($q, $def, $state);
+ return $q;
+ }
+
+ /**
+ * Bind Non Id Properties to the given Query
+ *
+ * @param ezcQueryUpdate|ezcQueryInsert $q
+ * @param ezcPersistentObjectDefinition $def
+ * @param array $state
+ * @return ezcQueryUpdate|ezcQueryInsert
+ */
+ private function bindNonIdPropertyValuesToQuery($q, $def, $state)
+ {
foreach ( $state as $name => $value )
{
- // Skip the id field.
- if ( $name != $def->idProperty->propertyName )
+ if ( $name !== $def->idProperty->propertyName )
{
// Set each of the properties.
$q->set(
$this->database->quoteIdentifier(
- $def->properties[$name]->columnName ),
- $q->bindValue( $value, null, $def->properties[$name]->databaseType )
- );
+ $def->properties[$name]->columnName
+ ),
+ $q->bindValue( $value, null, $def->properties[$name]->databaseType )
+ );
}
}
+ return $q;
+ }
+
+ /**
+ * Build an Update query given a definition and a state.
+ *
+ * @param ezcPersistentObjectDefinition $def
+ * @param array $state
+ * @return ezcQueryUpdate
+ */
+ private function buildUpdateQuery($def, $state)
+ {
+ // Set up and execute the query
+ $q = $this->database->createUpdateQuery();
+ $q->update( $this->database->quoteIdentifier( $def->table ) );
+ $q = $this->bindNonIdPropertyValuesToQuery($q, $def, $state);
+ $q = $this->buildUpdateWhereQuery($q, $def, $state);
+ return $q;
+ }
+
+ /**
+ * Build where clause for update query.
+ *
+ * @param ezcQueryUpdate $q
+ * @param ezcPersistentObjectDefinition $def
+ * @param array $state
+ * @return ezcQueryUpdate
+ */
+ private function buildUpdateWhereQuery($q, $def, $state)
+ {
+ $idValue = $state[$def->idProperty->propertyName];
+
$q->where(
$q->expr->eq(
$this->database->quoteIdentifier(
@@ -441,7 +495,7 @@
)
);

- $this->session->performQuery( $q, true );
+ return $q;
}

/**