dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Removed win32 ifdefs re connection resiliency (#802)

Browse source
This commit is contained in:
Jenny Tam 2018-06-21 14:29:09 -07:00 committed by GitHub
parent 53e4da40de
commit 81ff0851ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/pdo_sqlsrv/pdo_dbh.cpp
View file

@ -43,10 +43,8 @@ const char AttachDBFileName[] = "AttachDbFileName";
const char Authentication[] = "Authentication"; const char Authentication[] = "Authentication";
const char ColumnEncryption[] = "ColumnEncryption"; const char ColumnEncryption[] = "ColumnEncryption";
const char ConnectionPooling[] = "ConnectionPooling"; const char ConnectionPooling[] = "ConnectionPooling";
#ifdef _WIN32
const char ConnectRetryCount[] = "ConnectRetryCount"; const char ConnectRetryCount[] = "ConnectRetryCount";
const char ConnectRetryInterval[] = "ConnectRetryInterval"; const char ConnectRetryInterval[] = "ConnectRetryInterval";
#endif // _WIN32
const char Database[] = "Database"; const char Database[] = "Database";
const char Driver[] = "Driver"; const char Driver[] = "Driver";
const char Encrypt[] = "Encrypt"; const char Encrypt[] = "Encrypt";
@ -109,7 +107,6 @@ struct pdo_txn_isolation_conn_attr_func
static void func( connection_option const* /*option*/, _In_ zval* value_z, _Inout_ sqlsrv_conn* conn, std::string& /*conn_str*/ TSRMLS_DC ); static void func( connection_option const* /*option*/, _In_ zval* value_z, _Inout_ sqlsrv_conn* conn, std::string& /*conn_str*/ TSRMLS_DC );
}; };
#ifdef _WIN32
struct pdo_int_conn_str_func { struct pdo_int_conn_str_func {
static void func( _In_ connection_option const* option, _In_ zval* value, sqlsrv_conn* /*conn*/, _Out_ std::string& conn_str TSRMLS_DC ) static void func( _In_ connection_option const* option, _In_ zval* value, sqlsrv_conn* /*conn*/, _Out_ std::string& conn_str TSRMLS_DC )
@ -125,7 +122,6 @@ struct pdo_int_conn_str_func {
conn_str += "};"; conn_str += "};";
} }
}; };
#endif // _WIN32
template <unsigned int Attr> template <unsigned int Attr>
struct pdo_int_conn_attr_func { struct pdo_int_conn_attr_func {
@ -243,7 +239,6 @@ const connection_option PDO_CONN_OPTS[] = {
CONN_ATTR_STRING, CONN_ATTR_STRING,
column_encryption_set_func::func column_encryption_set_func::func
}, },
#ifdef _WIN32
{ {
PDOConnOptionNames::ConnectRetryCount, PDOConnOptionNames::ConnectRetryCount,
sizeof( PDOConnOptionNames::ConnectRetryCount ), sizeof( PDOConnOptionNames::ConnectRetryCount ),
@ -262,7 +257,6 @@ const connection_option PDO_CONN_OPTS[] = {
CONN_ATTR_INT, CONN_ATTR_INT,
pdo_int_conn_str_func::func pdo_int_conn_str_func::func
}, },
#endif // _WIN32
{ {
PDOConnOptionNames::Database, PDOConnOptionNames::Database,
sizeof( PDOConnOptionNames::Database ), sizeof( PDOConnOptionNames::Database ),

4
source/shared/core_sqlsrv.h
View file

@ -1112,10 +1112,8 @@ const char Driver[] = "Driver";
const char CharacterSet[] = "CharacterSet"; const char CharacterSet[] = "CharacterSet";
const char ConnectionPooling[] = "ConnectionPooling"; const char ConnectionPooling[] = "ConnectionPooling";
const char ColumnEncryption[] = "ColumnEncryption"; const char ColumnEncryption[] = "ColumnEncryption";
#ifdef _WIN32
const char ConnectRetryCount[] = "ConnectRetryCount"; const char ConnectRetryCount[] = "ConnectRetryCount";
const char ConnectRetryInterval[] = "ConnectRetryInterval"; const char ConnectRetryInterval[] = "ConnectRetryInterval";
#endif // _WIN32
const char Database[] = "Database"; const char Database[] = "Database";
const char Encrypt[] = "Encrypt"; const char Encrypt[] = "Encrypt";
const char Failover_Partner[] = "Failover_Partner"; const char Failover_Partner[] = "Failover_Partner";
@ -1168,10 +1166,8 @@ enum SQLSRV_CONN_OPTIONS {
SQLSRV_CONN_OPTION_KEYSTORE_PRINCIPAL_ID, SQLSRV_CONN_OPTION_KEYSTORE_PRINCIPAL_ID,
SQLSRV_CONN_OPTION_KEYSTORE_SECRET, SQLSRV_CONN_OPTION_KEYSTORE_SECRET,
SQLSRV_CONN_OPTION_TRANSPARENT_NETWORK_IP_RESOLUTION, SQLSRV_CONN_OPTION_TRANSPARENT_NETWORK_IP_RESOLUTION,
#ifdef _WIN32
SQLSRV_CONN_OPTION_CONN_RETRY_COUNT, SQLSRV_CONN_OPTION_CONN_RETRY_COUNT,
SQLSRV_CONN_OPTION_CONN_RETRY_INTERVAL, SQLSRV_CONN_OPTION_CONN_RETRY_INTERVAL,
#endif // _WIN32
// Driver specific connection options // Driver specific connection options
SQLSRV_CONN_OPTION_DRIVER_SPECIFIC = 1000, SQLSRV_CONN_OPTION_DRIVER_SPECIFIC = 1000,

6
source/sqlsrv/conn.cpp
View file

@ -95,7 +95,6 @@ struct bool_conn_str_func {
} }
}; };
#ifdef _WIN32
struct int_conn_str_func { struct int_conn_str_func {
static void func( _In_ connection_option const* option, _In_ zval* value, sqlsrv_conn* /*conn*/, _Out_ std::string& conn_str TSRMLS_DC ) static void func( _In_ connection_option const* option, _In_ zval* value, sqlsrv_conn* /*conn*/, _Out_ std::string& conn_str TSRMLS_DC )
@ -111,7 +110,6 @@ struct int_conn_str_func {
conn_str += "};"; conn_str += "};";
} }
}; };
#endif // _WIN32
template <unsigned int Attr> template <unsigned int Attr>
struct int_conn_attr_func { struct int_conn_attr_func {
@ -188,10 +186,8 @@ const char Authentication[] = "Authentication";
const char CharacterSet[] = "CharacterSet"; const char CharacterSet[] = "CharacterSet";
const char ColumnEncryption[] = "ColumnEncryption"; const char ColumnEncryption[] = "ColumnEncryption";
const char ConnectionPooling[] = "ConnectionPooling"; const char ConnectionPooling[] = "ConnectionPooling";
#ifdef _WIN32
const char ConnectRetryCount[] = "ConnectRetryCount"; const char ConnectRetryCount[] = "ConnectRetryCount";
const char ConnectRetryInterval[] = "ConnectRetryInterval"; const char ConnectRetryInterval[] = "ConnectRetryInterval";
#endif // _WIN32
const char Database[] = "Database"; const char Database[] = "Database";
const char DateAsString[] = "ReturnDatesAsStrings"; const char DateAsString[] = "ReturnDatesAsStrings";
const char Driver[] = "Driver"; const char Driver[] = "Driver";
@ -324,7 +320,6 @@ const connection_option SS_CONN_OPTS[] = {
CONN_ATTR_STRING, CONN_ATTR_STRING,
column_encryption_set_func::func column_encryption_set_func::func
}, },
#ifdef _WIN32
{ {
SSConnOptionNames::ConnectRetryCount, SSConnOptionNames::ConnectRetryCount,
sizeof( SSConnOptionNames::ConnectRetryCount ), sizeof( SSConnOptionNames::ConnectRetryCount ),
@ -343,7 +338,6 @@ const connection_option SS_CONN_OPTS[] = {
CONN_ATTR_INT, CONN_ATTR_INT,
int_conn_str_func::func int_conn_str_func::func
}, },
#endif // _WIN32
{ {
SSConnOptionNames::Database, SSConnOptionNames::Database,
sizeof( SSConnOptionNames::Database ), sizeof( SSConnOptionNames::Database ),