SQL_GUID is only defined if ODBCVER >= 0x0350

Jan-E · Mar 8, 2015 · 9628db1 · 9628db1
1 parent 7b639dc
commit 9628db1
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 0 deletions.
diff --git a/pdo_sqlsrv/core_results.cpp b/pdo_sqlsrv/core_results.cpp
@@ -313,7 +313,9 @@ sqlsrv_buffered_result_set::sqlsrv_buffered_result_set( sqlsrv_stmt* stmt TSRMLS
             // these types are the display size
             case SQL_BIGINT:
             case SQL_DECIMAL:
+#if (ODBCVER >= 0x0350)
             case SQL_GUID:
+#endif  /* ODBCVER >= 0x0350 */
             case SQL_NUMERIC:
                 core::SQLColAttribute( stmt, i + 1, SQL_DESC_DISPLAY_SIZE, NULL, 0, NULL,
                                        reinterpret_cast<SQLLEN*>( &meta[i].length ) TSRMLS_CC );
@@ -396,7 +398,9 @@ sqlsrv_buffered_result_set::sqlsrv_buffered_result_set( sqlsrv_stmt* stmt TSRMLS
             case SQL_CHAR:
             case SQL_DATETIME:
             case SQL_DECIMAL:
+#if (ODBCVER >= 0x0350)
             case SQL_GUID:
+#endif  /* ODBCVER >= 0x0350 */
             case SQL_NUMERIC:
             case SQL_LONGVARCHAR:
             case SQL_TYPE_DATE:

diff --git a/pdo_sqlsrv/core_stmt.cpp b/pdo_sqlsrv/core_stmt.cpp
@@ -1390,7 +1390,9 @@ void calc_string_size( sqlsrv_stmt* stmt, SQLUSMALLINT field_index, SQLLEN sql_t
             case SQL_INTEGER:
             case SQL_SMALLINT:
             case SQL_TINYINT:
+#if (ODBCVER >= 0x0350)
             case SQL_GUID:
+#endif  /* ODBCVER >= 0x0350 */
             case SQL_FLOAT:
             case SQL_DOUBLE:
             case SQL_REAL:

diff --git a/pdo_sqlsrv/pdo_stmt.cpp b/pdo_sqlsrv/pdo_stmt.cpp
@@ -95,7 +95,9 @@ inline pdo_param_type sql_type_to_pdo_type( SQLSMALLINT sql_type )
         case SQL_DECIMAL:
         case SQL_DOUBLE: 
         case SQL_FLOAT:
+#if (ODBCVER >= 0x0350)
         case SQL_GUID:
+#endif  /* ODBCVER >= 0x0350 */
         case SQL_LONGVARBINARY:
         case SQL_LONGVARCHAR:
         case SQL_NUMERIC:
@@ -1271,7 +1273,9 @@ sqlsrv_phptype pdo_sqlsrv_stmt::sql_type_to_php_type( SQLINTEGER sql_type, SQLUI
         case SQL_DECIMAL:
         case SQL_FLOAT:
         case SQL_REAL:
+#if (ODBCVER >= 0x0350)
         case SQL_GUID:
+#endif  /* ODBCVER >= 0x0350 */
         case SQL_NUMERIC:
         case SQL_WCHAR:
         case SQL_VARCHAR:

diff --git a/sqlsrv/core_results.cpp b/sqlsrv/core_results.cpp
@@ -313,7 +313,9 @@ sqlsrv_buffered_result_set::sqlsrv_buffered_result_set( sqlsrv_stmt* stmt TSRMLS
             // these types are the display size
             case SQL_BIGINT:
             case SQL_DECIMAL:
+#if (ODBCVER >= 0x0350)
             case SQL_GUID:
+#endif  /* ODBCVER >= 0x0350 */
             case SQL_NUMERIC:
                 core::SQLColAttribute( stmt, i + 1, SQL_DESC_DISPLAY_SIZE, NULL, 0, NULL,
                                        reinterpret_cast<SQLLEN*>( &meta[i].length ) TSRMLS_CC );
@@ -396,7 +398,9 @@ sqlsrv_buffered_result_set::sqlsrv_buffered_result_set( sqlsrv_stmt* stmt TSRMLS
             case SQL_CHAR:
             case SQL_DATETIME:
             case SQL_DECIMAL:
+#if (ODBCVER >= 0x0350)
             case SQL_GUID:
+#endif  /* ODBCVER >= 0x0350 */
             case SQL_NUMERIC:
             case SQL_LONGVARCHAR:
             case SQL_TYPE_DATE:

diff --git a/sqlsrv/core_stmt.cpp b/sqlsrv/core_stmt.cpp
@@ -1390,7 +1390,9 @@ void calc_string_size( sqlsrv_stmt* stmt, SQLUSMALLINT field_index, SQLLEN sql_t
             case SQL_INTEGER:
             case SQL_SMALLINT:
             case SQL_TINYINT:
+#if (ODBCVER >= 0x0350)
             case SQL_GUID:
+#endif  /* ODBCVER >= 0x0350 */
             case SQL_FLOAT:
             case SQL_DOUBLE:
             case SQL_REAL:

diff --git a/sqlsrv/init.cpp b/sqlsrv/init.cpp
@@ -358,7 +358,9 @@ PHP_MINIT_FUNCTION(sqlsrv)
     REGISTER_LONG_CONSTANT( "SQLSRV_SQLTYPE_TIMESTAMP",        constant_type.value, CONST_PERSISTENT | CONST_CS );
     REGISTER_LONG_CONSTANT( "SQLSRV_SQLTYPE_TINYINT",          SQL_TINYINT, CONST_PERSISTENT | CONST_CS );
     REGISTER_LONG_CONSTANT( "SQLSRV_SQLTYPE_UDT",              SQL_SS_UDT, CONST_PERSISTENT | CONST_CS );
+#if (ODBCVER >= 0x0350)
     REGISTER_LONG_CONSTANT( "SQLSRV_SQLTYPE_UNIQUEIDENTIFIER", SQL_GUID, CONST_PERSISTENT | CONST_CS );
+#endif  /* ODBCVER >= 0x0350 */
     REGISTER_LONG_CONSTANT( "SQLSRV_SQLTYPE_XML",              SQL_SS_XML, CONST_PERSISTENT | CONST_CS );
     constant_type.typeinfo.type = SQL_TYPE_DATE;
     constant_type.typeinfo.size = 10;

diff --git a/sqlsrv/stmt.cpp b/sqlsrv/stmt.cpp
@@ -173,7 +173,9 @@ sqlsrv_phptype ss_sqlsrv_stmt::sql_type_to_php_type( SQLINTEGER sql_type, SQLUIN
         case SQL_BIGINT:
         case SQL_CHAR:
         case SQL_DECIMAL:
+#if (ODBCVER >= 0x0350)
         case SQL_GUID:
+#endif  /* ODBCVER >= 0x0350 */
         case SQL_NUMERIC:
         case SQL_WCHAR:
         case SQL_SS_VARIANT:
@@ -1590,9 +1592,11 @@ bool determine_column_size_or_precision( sqlsrv_stmt const* stmt, sqlsrv_sqltype
         case SQL_TINYINT:
             *column_size = 3;
             break;
+#if (ODBCVER >= 0x0350)
         case SQL_GUID:
             *column_size = 36;
             break;
+#endif  /* ODBCVER >= 0x0350 */
         case SQL_FLOAT:
             *column_size = 53;
             break;
@@ -1683,7 +1687,9 @@ sqlsrv_phptype determine_sqlsrv_php_type( ss_sqlsrv_stmt const* stmt, SQLINTEGER
         case SQL_BIGINT:
         case SQL_CHAR:
         case SQL_DECIMAL:
+#if (ODBCVER >= 0x0350)
         case SQL_GUID:
+#endif  /* ODBCVER >= 0x0350 */
         case SQL_NUMERIC:
         case SQL_WCHAR:
             sqlsrv_phptype.typeinfo.type = SQLSRV_PHPTYPE_STRING;
@@ -2104,7 +2110,9 @@ bool is_valid_sqlsrv_sqltype( sqlsrv_sqltype sql_type )
         case SQL_INTEGER:
         case SQL_SMALLINT:
         case SQL_TINYINT:
+#if (ODBCVER >= 0x0350)
         case SQL_GUID:
+#endif  /* ODBCVER >= 0x0350 */
         case SQL_FLOAT:
         case SQL_REAL:
         case SQL_LONGVARBINARY: