firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:43:02 +01:00
Code Issues

Simplify migration for old databases affected by changes in

Browse Source 
CLIENT_ADDRESS. Refresh outdated readme.
This commit is contained in:
Dmitry Yemanov 2016-03-27 11:19:19 +03:00
parent 0f2134b4e1
commit f6e4f41bd9
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
doc/sql.extensions/README.context_variables2
View File

@ -54,12 +54,20 @@ Usage:
Variable name Value Variable name Value
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
NETWORK_PROTOCOL | The network protocol used by client to connect. Currently NETWORK_PROTOCOL | The network protocol used by client to connect. Currently
| used values: "TCPv4", "WNET", "XNET" and NULL | used values: "TCPv4", "TCPv6", "WNET", "XNET" and NULL
| |
CLIENT_ADDRESS | The wire protocol address of remote client represented as CLIENT_ADDRESS | The wire protocol address and port number of remote client
| string. Value is IP address in form "xxx.xxx.xxx.xxx" for | represented as string. Value is IP address concatenated with
| TCPv4 protocol, local host name for XNET protocol and | port number using the '/' separator character. Value is
| NULL for all other protocols | returned for TCPv4 and TCPv6 protocols only, for all other
| protocols NULL is returned
|
CLIENT_HOST | The wire protocol host name of remote client. Value is
| returned for all supported protocols
|
CLIENT_PID | Process ID of remote client application
|
CLIENT_PROCESS | Process name of remote client application
| |
DB_NAME | Canonical name of current database. It is either alias DB_NAME | Canonical name of current database. It is either alias
| name if connectivity via file names is not allowed or | name if connectivity via file names is not allowed or
@ -71,6 +79,11 @@ Usage:
TRANSACTION_ID | Numeric ID for current transaction. Returned value is the TRANSACTION_ID | Numeric ID for current transaction. Returned value is the
| same as of CURRENT_TRANSACTION pseudo-variable | same as of CURRENT_TRANSACTION pseudo-variable
| |
LOCK_TIMEOUT | Lock timeout value specified for current transaction
|
READ_ONLY | Returns "TRUE" if current transaction is read-only and
| "FALSE" otherwise
|
SESSION_ID | Numeric ID for current session. Returned value is the SESSION_ID | Numeric ID for current session. Returned value is the
| same as of CURRENT_CONNECTION pseudo-variable | same as of CURRENT_CONNECTION pseudo-variable
| |

8
src/jrd/SysFunction.cpp
View File

@ -210,6 +210,7 @@ const char
SESSION_ID_NAME[] = "SESSION_ID", SESSION_ID_NAME[] = "SESSION_ID",
NETWORK_PROTOCOL_NAME[] = "NETWORK_PROTOCOL", NETWORK_PROTOCOL_NAME[] = "NETWORK_PROTOCOL",
CLIENT_ADDRESS_NAME[] = "CLIENT_ADDRESS", CLIENT_ADDRESS_NAME[] = "CLIENT_ADDRESS",
CLIENT_HOST_NAME[] = "CLIENT_HOST",
CLIENT_PID_NAME[] = "CLIENT_PID", CLIENT_PID_NAME[] = "CLIENT_PID",
CLIENT_PROCESS_NAME[] = "CLIENT_PROCESS", CLIENT_PROCESS_NAME[] = "CLIENT_PROCESS",
CURRENT_USER_NAME[] = "CURRENT_USER", CURRENT_USER_NAME[] = "CURRENT_USER",
@ -2195,6 +2196,13 @@ dsc* evlGetContext(thread_db* tdbb, const SysFunction*, const NestValueArray& ar
resultStr = attachment->att_remote_address; resultStr = attachment->att_remote_address;
} }
else if (nameStr == CLIENT_HOST_NAME)
{
if (attachment->att_remote_host.isEmpty())
return NULL;
resultStr = attachment->att_remote_host;
}
else if (nameStr == CLIENT_PID_NAME) else if (nameStr == CLIENT_PID_NAME)
{ {
if (!attachment->att_remote_pid) if (!attachment->att_remote_pid)