Commit 8affdf01 authored by Bong Cosca's avatar Bong Cosca
Browse files

Avert any possible conflict in type detection with DB->schema()

parent 85bdd71a
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -271,17 +271,19 @@ class SQL extends \PDO {
				// SET GLOBAL innodb_stats_on_metadata=0;
				// This requires SUPER privilege!
				$rows=array();
				foreach ($this->exec($val[0],NULL,$ttl) as $row)
				foreach ($this->exec($val[0],NULL,$ttl) as $row) {
					$rows[$row[$val[1]]]=array(
						'type'=>$row[$val[2]],
						'pdo_type'=>
							preg_match('/int|bool/i',$row[$val[2]],$parts)?
							preg_match('/int\b|integer|bool/i',
								$row[$val[2]],$parts)?
							constant('\PDO::PARAM_'.strtoupper($parts[0])):
							\PDO::PARAM_STR,
						'default'=>$row[$val[3]],
						'nullable'=>$row[$val[4]]==$val[5],
						'pkey'=>$row[$val[6]]==$val[7]
					);
				}
				return $rows;
			}
		return FALSE;