From: Frank M. Kromann <fmk@php.net>
Date: Sun, 9 Feb 2003 07:18:27 +0000 (+0000)
Subject: Bug #21707 problem with real
X-Git-Tag: php-4.3.2RC1~313
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7145b24e5993070c8b72eeaf128f2c0d9f8c3f71;p=php

Bug #21707 problem with real
---

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index fa244f0c16..659f3edd44 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -306,6 +306,7 @@ PHP_MINIT_FUNCTION(mssql)
 	REGISTER_LONG_CONSTANT("SQLINT2",SQLINT2, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SQLINT4",SQLINT4, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SQLBIT",SQLBIT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("SQLFLT4",SQLFLT4, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SQLFLT8",SQLFLT8, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SQLFLTN",SQLFLTN, CONST_CS | CONST_PERSISTENT);
 	/* END MSSQL data types for mssql_sp_bind */
@@ -922,6 +923,7 @@ static void _mssql_get_sp_result(mssql_link *mssql_ptr, mssql_statement *stateme
 							Z_LVAL_P(bind->zval) = *((int *)(dbretdata(mssql_ptr->link,i)));
 							break;
 			
+						case SQLFLT4:
 						case SQLFLT8:
 						case SQLFLTN:
 							convert_to_double_ex(&bind->zval);
@@ -992,6 +994,7 @@ static int _mssql_fetch_batch(mssql_link *mssql_ptr, mssql_result *result, int r
 			case SQLINT2:
 			case SQLINT4:
 			case SQLINTN:
+			case SQLFLT4:
 			case SQLFLT8:
 			case SQLNUMERIC:
 			case SQLDECIMAL:
@@ -1421,6 +1424,7 @@ static char *php_mssql_get_field_name(int type)
 			return "datetime";
 			break;
 		case SQLDECIMAL:
+		case SQLFLT4:
 		case SQLFLT8:
 		case SQLFLTN:
 			return "real";
@@ -1967,6 +1971,7 @@ PHP_FUNCTION(mssql_bind)
 
 		switch (type)	{
 
+			case SQLFLT4:
 			case SQLFLT8:
 			case SQLFLTN:
 				convert_to_double_ex(var);
diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h
index 015c22401a..92251a92ef 100644
--- a/ext/mssql/php_mssql.h
+++ b/ext/mssql/php_mssql.h
@@ -80,7 +80,7 @@ typedef unsigned char *LPBYTE;
 #define tinyintcol(i) ((int) *(DBTINYINT *) dbdata(mssql_ptr->link,i))
 #define anyintcol(j) (coltype(j)==SQLINT4?intcol(j):(coltype(j)==SQLINT2?smallintcol(j):tinyintcol(j)))
 #define charcol(i) ((DBCHAR *) dbdata(mssql_ptr->link,i))
-#define floatcol4(i) (*(DBFLT8 *) dbdata(mssql_ptr->link,i))
+#define floatcol4(i) (*(DBFLT4 *) dbdata(mssql_ptr->link,i))
 #define floatcol8(i) (*(DBFLT8 *) dbdata(mssql_ptr->link,i))
 
 #ifdef ZTS