Changeset 8166

Timestamp:

03/31/08 09:18:21 (7 months ago)

Author:

francois

Message:

sfPropelVersionableBehaviorPlugin Made incremental storage rely on a real version comparison, rather than the array of modified columns. Fixes modified columns not being saved when using toVersion.

Files:

• plugins/sfPropelVersionableBehaviorPlugin/trunk/README (modified) (1 diff)
• plugins/sfPropelVersionableBehaviorPlugin/trunk/lib/model/ResourceVersion.php (modified) (3 diffs)
• plugins/sfPropelVersionableBehaviorPlugin/trunk/lib/sfPropelVersionableBehavior.class.php (modified) (4 diffs)
• plugins/sfPropelVersionableBehaviorPlugin/trunk/test/unit/PropelVersionableBehaviorTest.php (modified) (3 diffs)

plugins/sfPropelVersionableBehaviorPlugin/trunk/README

@@ -441 +441 @@
-== Changelog ==
-
-
-
+
+
+
- * francois: Added the ability to declare related objects to save at behavior declaration
- * francois: Fixed `ResourceVersion::getResourceInstance()` creates new objects and saving these objects creates a new row in the resource table (#3229)

plugins/sfPropelVersionableBehaviorPlugin/trunk/lib/model/ResourceVersion.php

@@ -24 +24 @@
-   * @param      Array         $withObjects      Optional list of object classes to create and attach to the current resource
-   */
-, $modifiedColumns = array()
+
-  {
-    if($resource->isNew())
@@ -34 +34 @@
-    if($withVersion)
-    {
-
+
+
+
+
+
+
-    }
-
-
-
+
+
+
+
-    foreach ($resource->getPeer()->getFieldNames() as $attribute_name)
-    {
-
-
+
+
+
+
+
+
+
+
+
+
+
-      {
-        // First version or modified attribute
-        $getter = sprintf('get%s', $attribute_name);
-        $attributeVersion = new ResourceAttributeVersion();
-        $attributeVersion->setAttributeName($attribute_name);
-        $attributeVersion->setAttributeValue($resource->$getter());
-        $attributeVersion->save();
-        
-        $attributeVersionId = $attributeVersion->getId();
-        $isModified = true;
-      }
-      else
-      {
-        // Attribute not modified
-        // So we use the attribute from a previous version
-        if(!$previousResourceAttributeVersions)
-        {
-          foreach($previousResourceVersion->getResourceAttributeVersions() as $resourceAttributeVersion)
-          {
-            $previousResourceAttributeVersions[$resourceAttributeVersion->getAttributeName()] = $resourceAttributeVersion->getId();
-          }
-        }
-        
-        $attributeVersionId = $previousResourceAttributeVersions[$attribute_name];
-        $isModified = false;
-      }
-      
@@ -115 +113 @@
-    return ResourceAttributeVersionPeer::doSelect($c);
-  }
+  
+  public function getAttributesArray()
+  {
+    $ret = array();
+    foreach($this->getResourceAttributeVersions() as $attribute)
+    {
+      $ret[$attribute->getAttributeName()] = array(
+        'value' => $attribute->getAttributeValue(),
+        'id'    => $attribute->getId()
+      );
+    }
+    
+    return $ret;
+  }
-
+  public function getAttributeValue($name)
+  {
+    $c = new Criteria();
+    $c->add(ResourceAttributeVersionHashPeer::RESOURCE_VERSION_ID, $this->getId());
+    $c->addJoin(ResourceAttributeVersionHashPeer::RESOURCE_ATTRIBUTE_VERSION_ID, ResourceAttributeVersionPeer::ID);
+    $c->add(ResourceAttributeVersionPeer::ATTRIBUTE_NAME, $name);
+    $attribute = ResourceAttributeVersionPeer::doSelectOne($c);
+
+    return $attribute->getAttributeValue();
+  }
+  
-  public function getModifiedResourceAttributeVersions()
-  {

plugins/sfPropelVersionableBehaviorPlugin/trunk/lib/sfPropelVersionableBehavior.class.php

@@ -199 +199 @@
-   * @param      array    Optional list of related object classes to version together with the main object
-   */
-array()
+null
-  {
-    if (self::versionConditionMet($resource))
@@ -219 +219 @@
-    // resourceVersion will be saved in the postSave() method, when the resource has primary and foreign key determined
-    
-
+is_array($withObjects) && 
-    {
-      $resource->versionWithObjects = $withObjects;
@@ -339 +339 @@
-      self::incrementVersion($resource);
-    }
-    // modified columns array will be reset by the save(), but we need it in the postSave()...
-    // So we save it for later.
-    $modifiedColumns = array();
-    foreach ($resource->getPeer()->getFieldNames() as $attribute_name)
-    {
-      $attribute_colname = $resource->getPeer()->translateFieldName($attribute_name, BasePeer::TYPE_PHPNAME, BasePeer::TYPE_COLNAME);
-      if($resource->isColumnModified($attribute_colname))
-      {
-        $modifiedColumns[] = $attribute_name;
-      }
-    }
-    $resource->versionModifiedColumns = $modifiedColumns;
-  }
-  
@@ -380 +368 @@
-      $withObjects = isset($resource->versionWithObjects) ? $resource->versionWithObjects : self::getBehaviorParameter(get_class($resource), 'with', array());
-      $resource->resourceVersion->setResourceId($resource->getPrimaryKey());
-, $resource->versionModifiedColumns
+
-      $resource->resourceVersion->save();
-      $resource->resourceVersion = null;
-    }
-    unset($resource->versionModifiedColumns);
-    unset($resource->wasModified);
-  }

plugins/sfPropelVersionableBehaviorPlugin/trunk/test/unit/PropelVersionableBehaviorTest.php

@@ -402 +402 @@
-sfConfig::set('app_sfPropelVersionableBehaviorPlugin_auto_versioning', true);
-
-sfPropelVersionableBehaviorPlugin 
- 
+
+
-
-$r = _create_resource();
@@ -414 +414 @@
-
-// #1564 crashes while creating a new version if no prior version exists
- 
+
-
-$r = _create_resource();
@@ -427 +427 @@
-}
-
-
+
+
-$r = _create_resource();
-$r->setByName($test_class_title_column, 'v1', BasePeer::TYPE_FIELDNAME);