lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX : php_build_class_from_table comma ending on insert

Browse Source
This commit is contained in:
Florian HENRY 2015-07-28 11:20:00 +02:00
parent 7e7d39f068
commit ab3e1631f4
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dev/skeletons/build_class_from_table.php
View File

@ -227,6 +227,13 @@ foreach($property as $key => $prop)
$targetcontent=preg_replace('/if \(isset\(\$this->prop1\)\) {((\n|\r|\t)*)\$this->prop1 = trim\(\$this->prop1\);((\n|\r|\t)*)}/', $varprop, $targetcontent); $targetcontent=preg_replace('/if \(isset\(\$this->prop1\)\) {((\n|\r|\t)*)\$this->prop1 = trim\(\$this->prop1\);((\n|\r|\t)*)}/', $varprop, $targetcontent);
$targetcontent=preg_replace('/if \(isset\(\$this->prop2\)\) {((\n|\r|\t)*)\$this->prop2 = trim\(\$this->prop2\);((\n|\r|\t)*)}/', '', $targetcontent); $targetcontent=preg_replace('/if \(isset\(\$this->prop2\)\) {((\n|\r|\t)*)\$this->prop2 = trim\(\$this->prop2\);((\n|\r|\t)*)}/', '', $targetcontent);
$no_output_field=0;
foreach($property as $key => $prop)
{
if ($prop['field'] == 'tms') $no_output_field++; // This is a field of type timestamp edited automatically
if ($prop['extra'] == 'auto_increment') $no_output_field++;
}
// Substitute insert into parameters // Substitute insert into parameters
$varprop="\n"; $varprop="\n";
$cleanparam=''; $cleanparam='';
@ -241,7 +248,7 @@ foreach($property as $key => $prop)
if ($addfield) if ($addfield)
{ {
$varprop.="\t\t\$sql.= '".$prop['field']; $varprop.="\t\t\$sql.= '".$prop['field'];
if ($i < count($property)) $varprop.=","; if ($i <= count($property)-$no_output_field) $varprop.=",";
$varprop.="';"; $varprop.="';";
$varprop.="\n"; $varprop.="\n";
} }
@ -255,12 +262,7 @@ $cleanparam='';
$i=0; $i=0;
//Count nb field to output to manage commat at end SQL instruction //Count nb field to output to manage commat at end SQL instruction
$no_output_field=0;
foreach($property as $key => $prop)
{
if ($prop['field'] == 'tms') $no_output_field++; // This is a field of type timestamp edited automatically
if ($prop['extra'] == 'auto_increment') $no_output_field++;
}
foreach($property as $key => $prop) foreach($property as $key => $prop)
{ {
@ -307,6 +309,7 @@ foreach($property as $key => $prop)
$varprop.='.\').'; $varprop.='.\').';
} }
if ($i < (count($property)-$no_output_field)) $varprop.=".','"; if ($i < (count($property)-$no_output_field)) $varprop.=".','";
$varprop.=';'; $varprop.=';';
$varprop.="\n"; $varprop.="\n";