summaryrefslogtreecommitdiff
path: root/datadict/datadict-mssqlnative.inc.php
diff options
context:
space:
mode:
Diffstat (limited to 'datadict/datadict-mssqlnative.inc.php')
-rw-r--r--datadict/datadict-mssqlnative.inc.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/datadict/datadict-mssqlnative.inc.php b/datadict/datadict-mssqlnative.inc.php
index 38f6ed30..bd4e238d 100644
--- a/datadict/datadict-mssqlnative.inc.php
+++ b/datadict/datadict-mssqlnative.inc.php
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.10 08-Mar-2018
+ @version v5.21.0-dev ??-???-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -94,7 +94,10 @@ class ADODB2_mssqlnative extends ADODB_DataDict {
-3 => 'X'
);
- return $_typeConversion($t);
+ if (isset($_typeConversion[$t]))
+ return $_typeConversion[$t];
+
+ return ADODB_DEFAULT_METATYPE;
}
@@ -126,7 +129,6 @@ class ADODB2_mssqlnative extends ADODB_DataDict {
case 'F': return 'REAL';
case 'N': return 'NUMERIC';
default:
- print "RETURN $meta";
return $meta;
}
}
@@ -353,7 +355,7 @@ CREATE TABLE
}
- function _GetSize($ftype, $ty, $fsize, $fprec)
+ function _GetSize($ftype, $ty, $fsize, $fprec,$options=false)
{
switch ($ftype) {
case 'INT':
@@ -363,7 +365,7 @@ CREATE TABLE
return $ftype;
}
if ($ty == 'T') return $ftype;
- return parent::_GetSize($ftype, $ty, $fsize, $fprec);
+ return parent::_GetSize($ftype, $ty, $fsize, $fprec, $options);
}
}