From f1131ae438460f78c58f0c0b10c7c31dc366f11a Mon Sep 17 00:00:00 2001
From: bjverde <bjverde@yahoo.com.br>
Date: Fri, 16 Apr 2021 00:47:08 -0300
Subject: [PATCH] =?UTF-8?q?:bug:=20#195=20voltando=20a=20vers=C3=A3o=20ant?=
 =?UTF-8?q?erior?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webform/TFormDinDaoDbms.class.php         | 54 +++++++++----------
 .../webform/TFormDinDaoDbms.class.php         | 54 +++++++++----------
 2 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/FormDin5/lib/widget/FormDin5/webform/TFormDinDaoDbms.class.php b/FormDin5/lib/widget/FormDin5/webform/TFormDinDaoDbms.class.php
index 8c02cee8..333e18e3 100644
--- a/FormDin5/lib/widget/FormDin5/webform/TFormDinDaoDbms.class.php
+++ b/FormDin5/lib/widget/FormDin5/webform/TFormDinDaoDbms.class.php
@@ -831,36 +831,34 @@ public function getSqlToFieldsFromDatabase() {
 			$res  = $this->executeSql($sql);
 			$data = null;
 			$sql  = null;
-			if(is_array($res)){
-				foreach($res as $rownum => $row)
+			foreach($res as $rownum => $row)
+			{
+				$data[$rownum]['COLUMN_NAME'] 	= $row['NAME'];
+				$data[$rownum]['COLUMN_DEFAULT']= $row['DFLT_VALUE'];
+				$data[$rownum]['AUTOINCREMENT'] = $row['PK'];
+				$data[$rownum]['REQUIRED'] 		= ( $row['NOTNULL'] == 0 ? 'FALSE' : 'TRUE' );
+				$data[$rownum]['DATA_TYPE'] 	= strtoupper($row['TYPE']);
+				$data[$rownum]['CHAR_MAX'] 	= null;
+				$data[$rownum]['NUM_LENGTH']= 0;
+				$data[$rownum]['NUM_SCALE']	= 0;
+				$data[$rownum]['PRIMARYKEY']	= $row['PK'];
+				if( preg_match('/\(/',$row['TYPE']) == 1 )
 				{
-					$data[$rownum]['COLUMN_NAME'] 	= $row['NAME'];
-					$data[$rownum]['COLUMN_DEFAULT']= $row['DFLT_VALUE'];
-					$data[$rownum]['AUTOINCREMENT'] = $row['PK'];
-					$data[$rownum]['REQUIRED'] 		= ( $row['NOTNULL'] == 0 ? 'FALSE' : 'TRUE' );
-					$data[$rownum]['DATA_TYPE'] 	= strtoupper($row['TYPE']);
-					$data[$rownum]['CHAR_MAX'] 	= null;
-					$data[$rownum]['NUM_LENGTH']= 0;
-					$data[$rownum]['NUM_SCALE']	= 0;
-					$data[$rownum]['PRIMARYKEY']	= $row['PK'];
-					if( preg_match('/\(/',$row['TYPE']) == 1 )
-					{
-						$aTemp = explode('(',$row['TYPE']);
-						$data[$rownum]['DATA_TYPE'] = $aTemp[0];
-						$type= substr($row['TYPE'],strpos($row['TYPE'],'('));
-						$type = preg_replace('/(\(|\))/','',$type);
-						@list($length,$precision) = explode(',',$type);
-						
-						if( preg_match('/varchar/i',$aTemp[0]==1) ) {
-							$data[$rownum]['DATA_LENGTH'] = $length;
-						}
-						else {
-							$data[$rownum]['CHAR_MAX'] 	  = 0;
-							$data[$rownum]['NUM_LENGTH']  = $length;
-							$data[$rownum]['NUM_SCALE']   = $precision;
-						}
+					$aTemp = explode('(',$row['TYPE']);
+					$data[$rownum]['DATA_TYPE'] = $aTemp[0];
+					$type= substr($row['TYPE'],strpos($row['TYPE'],'('));
+					$type = preg_replace('/(\(|\))/','',$type);
+					@list($length,$precision) = explode(',',$type);
+					
+					if( preg_match('/varchar/i',$aTemp[0]==1) ) {
+						$data[$rownum]['DATA_LENGTH'] = $length;
 					}
-				}//Fim foreach
+					else {
+						$data[$rownum]['CHAR_MAX'] 	  = 0;
+						$data[$rownum]['NUM_LENGTH']  = $length;
+						$data[$rownum]['NUM_SCALE']   = $precision;
+					}
+				}
 			}
 		}
 		$result = array();
diff --git a/appexemplo_v1.0/app/lib/widget/FormDin5/webform/TFormDinDaoDbms.class.php b/appexemplo_v1.0/app/lib/widget/FormDin5/webform/TFormDinDaoDbms.class.php
index 8c02cee8..333e18e3 100644
--- a/appexemplo_v1.0/app/lib/widget/FormDin5/webform/TFormDinDaoDbms.class.php
+++ b/appexemplo_v1.0/app/lib/widget/FormDin5/webform/TFormDinDaoDbms.class.php
@@ -831,36 +831,34 @@ public function getSqlToFieldsFromDatabase() {
 			$res  = $this->executeSql($sql);
 			$data = null;
 			$sql  = null;
-			if(is_array($res)){
-				foreach($res as $rownum => $row)
+			foreach($res as $rownum => $row)
+			{
+				$data[$rownum]['COLUMN_NAME'] 	= $row['NAME'];
+				$data[$rownum]['COLUMN_DEFAULT']= $row['DFLT_VALUE'];
+				$data[$rownum]['AUTOINCREMENT'] = $row['PK'];
+				$data[$rownum]['REQUIRED'] 		= ( $row['NOTNULL'] == 0 ? 'FALSE' : 'TRUE' );
+				$data[$rownum]['DATA_TYPE'] 	= strtoupper($row['TYPE']);
+				$data[$rownum]['CHAR_MAX'] 	= null;
+				$data[$rownum]['NUM_LENGTH']= 0;
+				$data[$rownum]['NUM_SCALE']	= 0;
+				$data[$rownum]['PRIMARYKEY']	= $row['PK'];
+				if( preg_match('/\(/',$row['TYPE']) == 1 )
 				{
-					$data[$rownum]['COLUMN_NAME'] 	= $row['NAME'];
-					$data[$rownum]['COLUMN_DEFAULT']= $row['DFLT_VALUE'];
-					$data[$rownum]['AUTOINCREMENT'] = $row['PK'];
-					$data[$rownum]['REQUIRED'] 		= ( $row['NOTNULL'] == 0 ? 'FALSE' : 'TRUE' );
-					$data[$rownum]['DATA_TYPE'] 	= strtoupper($row['TYPE']);
-					$data[$rownum]['CHAR_MAX'] 	= null;
-					$data[$rownum]['NUM_LENGTH']= 0;
-					$data[$rownum]['NUM_SCALE']	= 0;
-					$data[$rownum]['PRIMARYKEY']	= $row['PK'];
-					if( preg_match('/\(/',$row['TYPE']) == 1 )
-					{
-						$aTemp = explode('(',$row['TYPE']);
-						$data[$rownum]['DATA_TYPE'] = $aTemp[0];
-						$type= substr($row['TYPE'],strpos($row['TYPE'],'('));
-						$type = preg_replace('/(\(|\))/','',$type);
-						@list($length,$precision) = explode(',',$type);
-						
-						if( preg_match('/varchar/i',$aTemp[0]==1) ) {
-							$data[$rownum]['DATA_LENGTH'] = $length;
-						}
-						else {
-							$data[$rownum]['CHAR_MAX'] 	  = 0;
-							$data[$rownum]['NUM_LENGTH']  = $length;
-							$data[$rownum]['NUM_SCALE']   = $precision;
-						}
+					$aTemp = explode('(',$row['TYPE']);
+					$data[$rownum]['DATA_TYPE'] = $aTemp[0];
+					$type= substr($row['TYPE'],strpos($row['TYPE'],'('));
+					$type = preg_replace('/(\(|\))/','',$type);
+					@list($length,$precision) = explode(',',$type);
+					
+					if( preg_match('/varchar/i',$aTemp[0]==1) ) {
+						$data[$rownum]['DATA_LENGTH'] = $length;
 					}
-				}//Fim foreach
+					else {
+						$data[$rownum]['CHAR_MAX'] 	  = 0;
+						$data[$rownum]['NUM_LENGTH']  = $length;
+						$data[$rownum]['NUM_SCALE']   = $precision;
+					}
+				}
 			}
 		}
 		$result = array();