Fixed Issue#99

2 files changed, 2 insertions, 2 deletions

diff --git a/framework/Data/ActiveRecord/TActiveRecordGateway.php b/framework/Data/ActiveRecord/TActiveRecordGateway.php
index 6cce9eb9..e588b976 100644
--- a/framework/Data/ActiveRecord/TActiveRecordGateway.php
+++ b/framework/Data/ActiveRecord/TActiveRecordGateway.php
@@ -349,7 +349,7 @@ class TActiveRecordGateway extends TComponent
 					$tableInfo->getTableFullName(), $name);
 			}
 			if($column->getIsPrimaryKey())
-				$primary[] = $value;
+				$primary[$name] = $value;
 			else
 				$values[$name] = $value;
 		}
diff --git a/framework/Data/DataGateway/TDataGatewayCommand.php b/framework/Data/DataGateway/TDataGatewayCommand.php
index 35e4dcbe..7425e6c4 100644
--- a/framework/Data/DataGateway/TDataGatewayCommand.php
+++ b/framework/Data/DataGateway/TDataGatewayCommand.php
@@ -276,7 +276,7 @@ class TDataGatewayCommand extends TComponent
 		{

 			$column = $this->getTableInfo()->getColumn($key)->getColumnName();

 			$criteria[] = $column.' = :'.$key;

-			$bindings[$key] = $values[$i++];

+			$bindings[$key] = isset($values[$key])?$values[$key]:$values[$i++];

 		}

 		return array(implode(' AND ', $criteria), $bindings);

 	}