Correccion al editar un pmtable se eliminan los registros

This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-12-10 16:32:31 -04:00
parent 5881c41fde
commit a9f2a8ea91
4 changed files with 27 additions and 9 deletions

View File

@@ -149,7 +149,7 @@ abstract class FileSystem {
* by the given abstract pathname, or zero if it does not exist or some
* other I/O error occurs.
*/
function getBooleanAttributes($f) {
function getBooleanAttributes(&$f = null) {
throw new Exception("SYSTEM ERROR method getBooleanAttributes() not implemented by fs driver");
}

View File

@@ -191,7 +191,7 @@ class UnixFileSystem extends FileSystem {
/* -- most of the following is mapped to the php natives wrapped by FileSystem */
/* -- Attribute accessors -- */
function getBooleanAttributes(&$f) {
function getBooleanAttributes(&$f = null) {
//$rv = getBooleanAttributes0($f);
$name = $f->getName();
$hidden = (strlen($name) > 0) && ($name{0} == '.');

View File

@@ -40,6 +40,7 @@ class PmTable
private $schemaFile = '';
private $tableName;
private $columns;
private $primaryKey= array();
private $baseDir = '';
private $targetDir = '';
private $configDir = '';
@@ -671,8 +672,29 @@ class PmTable
$sql = "SELECT * FROM $tableBackup";
$rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
// array the primary keys
foreach($this->columns as $value) {
if ($value->field_key == 1) {
$this->primaryKey[] = $value->field_name;
}
}
$flagPrimaryKey = 1;
while ($rs->next()) {
$row = $rs->getRow();
if ($flagPrimaryKey) {
// verify row has all primary keys
$keys = 0;
foreach ($row as $colName => $value) {
if (in_array($colName,$this->primaryKey)){
$keys++;
}
}
if ($keys != count($this->primaryKey)) {
return $stmt->executeQuery(str_replace($table, $tableBackup, $queryStack["drop"]));
}
$flagPrimaryKey = 0;
}
$oTable = new $tableFileName();
$oTable->fromArray($row, BasePeer::TYPE_FIELDNAME);

View File

@@ -208,13 +208,11 @@ class pmTablesProxy extends HttpProxyController
$result = new StdClass();
try {
$result = new stdClass();
ob_start();
$data = (array) $httpData;
$data['PRO_UID'] = trim( $data['PRO_UID'] );
$data['columns'] = G::json_decode( stripslashes( $httpData->columns ) ); //decofing data columns
$isReportTable = $data['PRO_UID'] != '' ? true : false;
$oAdditionalTables = new AdditionalTables();
$oFields = new Fields();
@@ -252,7 +250,6 @@ class pmTablesProxy extends HttpProxyController
) ) ));
}
}
//backward compatility
foreach ($columns as $i => $column) {
if (in_array( strtoupper( $columns[$i]->field_name ), $reservedWordsSql ) || in_array( strtolower( $columns[$i]->field_name ), $reservedWordsPhp )) {
@@ -318,7 +315,6 @@ class pmTablesProxy extends HttpProxyController
$oCriteria->add( FieldsPeer::ADD_TAB_UID, $data['REP_TAB_UID'] );
FieldsPeer::doDelete( $oCriteria );
}
// Updating pmtable fields
foreach ($columns as $i => $column) {
$field = array (
@@ -747,7 +743,7 @@ class pmTablesProxy extends HttpProxyController
*/
public function exportCSV ($httpData)
{
$result = new StdClass();
try {
$link = '';