lib/Doctrine/AuditLog.php

@@ -129,7 +129,7 @@ class Doctrine_AuditLog
         return $q->execute($values, Doctrine_HYDRATE::HYDRATE_ARRAY);
     }
     public function buildDefinition(Doctrine_Table $table)
-    {              
+    {
         $this->_options['className'] = str_replace('%CLASS%', 
                                                    $this->_options['table']->getComponentName(),
                                                    $this->_options['className']);
@@ -143,6 +143,9 @@ class Doctrine_AuditLog
         }
 
         $columns = $table->getColumns();
+        
+        // the version column should be part of the primary key definition
+        $columns[$this->_options['versionColumn']]['primary'] = true;
 
         $id = $table->getIdentifier();
 
@@ -150,8 +153,6 @@ class Doctrine_AuditLog
 
         $builder = new Doctrine_Import_Builder();
 
-        $options['primary'][] = $this->_options['versionColumn'];
-
         $def = $builder->buildDefinition($options, $columns);
 
         if ( ! $this->_options['generateFiles']) {

lib/Doctrine/Record.php

@@ -1375,6 +1375,10 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
                 ->getAuditLog()
                 ->getVersion($this, $version);
         
+        if ( ! isset($data[0])) {
+            throw new Doctrine_Record_Exception('Version ' . $version . ' does not exist!');                       	
+        }
+
         $this->_data = $data[0];
     }
     /**