mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-05 21:58:10 +02:00
Code Issues Releases Wiki Activity

Column::detectTypes() moved to Helpers

Browse Source
This commit is contained in:
David Grudl
2015-10-13 15:48:24 +02:00
parent 4630e1818f
commit ee4cd0d6ef
3 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Dibi/Helpers.php
View File

@@ -12,6 +12,9 @@ class Helpers
{ {
use Strict; use Strict;
/** @var array */
private static $types;
/** /**
* Prints out a syntax highlighted version of the SQL command or Result. * Prints out a syntax highlighted version of the SQL command or Result.
* @param string|Result * @param string|Result
@@ -129,4 +132,45 @@ class Helpers
} }
} }
/**
* Heuristic type detection.
* @param string
* @return string|NULL
* @internal
*/
public static function detectType($type)
{
static $patterns = [
'^_' => Type::TEXT, // PostgreSQL arrays
'BYTEA|BLOB|BIN' => Type::BINARY,
'TEXT|CHAR|POINT|INTERVAL' => Type::TEXT,
'YEAR|BYTE|COUNTER|SERIAL|INT|LONG|SHORT' => Type::INTEGER,
'CURRENCY|REAL|MONEY|FLOAT|DOUBLE|DECIMAL|NUMERIC|NUMBER' => Type::FLOAT,
'^TIME$' => Type::TIME,
'TIME' => Type::DATETIME, // DATETIME, TIMESTAMP
'DATE' => Type::DATE,
'BOOL' => Type::BOOL,
];
foreach ($patterns as $s => $val) {
if (preg_match("#$s#i", $type)) {
return $val;
}
}
return NULL;
}
/**
* @internal
*/
public static function getTypeCache()
{
if (self::$types === NULL) {
self::$types = new HashMap([__CLASS__, 'detectType']);
}
return self::$types;
}
} }

46
src/Dibi/Reflection/Column.php
View File

@@ -29,9 +29,6 @@ class Column
{ {
use Dibi\Strict; use Dibi\Strict;
/** @var array */
private static $types;
/** @var Dibi\Reflector|NULL when created by Result */ /** @var Dibi\Reflector|NULL when created by Result */
private $reflector; private $reflector;
@@ -99,7 +96,7 @@ class Column
*/ */
public function getType() public function getType()
{ {
return self::getTypeCache()->{$this->info['nativetype']}; return Dibi\Helpers::getTypeCache()->{$this->info['nativetype']};
} }
@@ -166,45 +163,4 @@ class Column
return isset($this->info['vendor'][$key]) ? $this->info['vendor'][$key] : NULL; return isset($this->info['vendor'][$key]) ? $this->info['vendor'][$key] : NULL;
} }
/**
* Heuristic type detection.
* @param string
* @return string|NULL
* @internal
*/
public static function detectType($type)
{
static $patterns = [
'^_' => Type::TEXT, // PostgreSQL arrays
'BYTEA|BLOB|BIN' => Type::BINARY,
'TEXT|CHAR|POINT|INTERVAL' => Type::TEXT,
'YEAR|BYTE|COUNTER|SERIAL|INT|LONG|SHORT' => Type::INTEGER,
'CURRENCY|REAL|MONEY|FLOAT|DOUBLE|DECIMAL|NUMERIC|NUMBER' => Type::FLOAT,
'^TIME$' => Type::TIME,
'TIME' => Type::DATETIME, // DATETIME, TIMESTAMP
'DATE' => Type::DATE,
'BOOL' => Type::BOOL,
];
foreach ($patterns as $s => $val) {
if (preg_match("#$s#i", $type)) {
return $val;
}
}
return NULL;
}
/**
* @internal
*/
public static function getTypeCache()
{
if (self::$types === NULL) {
self::$types = new Dibi\HashMap([__CLASS__, 'detectType']);
}
return self::$types;
}
} }

2
src/Dibi/Result.php
View File

@@ -468,7 +468,7 @@ class Result implements IDataSource
*/ */
private function detectTypes() private function detectTypes()
{ {
$cache = Reflection\Column::getTypeCache(); $cache = Helpers::getTypeCache();
try { try {
foreach ($this->getResultDriver()->getResultColumns() as $col) { foreach ($this->getResultDriver()->getResultColumns() as $col) {
$this->types[$col['name']] = $cache->{$col['nativetype']}; $this->types[$col['name']] = $cache->{$col['nativetype']};