diff options
| author | Anders Svensson <[email protected]> | 2011-06-28 16:13:09 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-06-28 16:13:09 +0200 |
| commit | 5a57f3798edd56caa61514378c673ff78ac397d2 (patch) | |
| tree | 44e8e46544c0d312580b1cc12e9842e3683d0cb7 /lib/odbc/doc | |
| parent | bd6666300edb76e09c07508e3513f7bdde985b43 (diff) | |
| parent | 4c6c6e297e4e73ba99b882cdc622a8a439dafeda (diff) | |
| download | otp-5a57f3798edd56caa61514378c673ff78ac397d2.tar.gz otp-5a57f3798edd56caa61514378c673ff78ac397d2.tar.bz2 otp-5a57f3798edd56caa61514378c673ff78ac397d2.zip | |
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'lib/odbc/doc')
| -rw-r--r-- | lib/odbc/doc/src/databases.xml | 4 | ||||
| -rw-r--r-- | lib/odbc/doc/src/odbc.xml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/odbc/doc/src/databases.xml b/lib/odbc/doc/src/databases.xml index a6ba0e5245..09f5a5af5b 100644 --- a/lib/odbc/doc/src/databases.xml +++ b/lib/odbc/doc/src/databases.xml @@ -205,6 +205,10 @@ when p >= 16 </cell> <cell align="left" valign="middle">String | Binary (configurable)</cell> </row> <row> + <cell align="left" valign="middle">SQL_WLONGVARCHAR(size) </cell> + <cell align="left" valign="middle">Unicode binary encoded as UTF16 little endian.</cell> + </row> + <row> <cell align="left" valign="middle">SQL_BINARY</cell> <cell align="left" valign="middle">String | Binary (configurable)</cell> </row> diff --git a/lib/odbc/doc/src/odbc.xml b/lib/odbc/doc/src/odbc.xml index 70d8cfbe22..11ca97f743 100644 --- a/lib/odbc/doc/src/odbc.xml +++ b/lib/odbc/doc/src/odbc.xml @@ -102,7 +102,7 @@ {sql_decimal, precision(), scale()} | {sql_numeric, precision(), scale()} | {sql_char, size()} | {sql_wchar, size()} | {sql_varchar, size()} | {sql_wvarchar, size()}| {sql_float, precision()} | - {sql_float, precision()} | sql_real | sql_double | sql_bit | atom() + {sql_wlongvarchar, size()} | {sql_float, precision()} | sql_real | sql_double | sql_bit | atom() </code> <code type="none"> precision() = integer() </code> |