diff options
Diffstat (limited to 'lib/odbc/doc')
| -rw-r--r-- | lib/odbc/doc/src/databases.xml | 8 | ||||
| -rw-r--r-- | lib/odbc/doc/src/getting_started.xml | 16 | ||||
| -rw-r--r-- | lib/odbc/doc/src/notes.xml | 58 | ||||
| -rw-r--r-- | lib/odbc/doc/src/odbc.xml | 2 |
4 files changed, 47 insertions, 37 deletions
diff --git a/lib/odbc/doc/src/databases.xml b/lib/odbc/doc/src/databases.xml index 2c1b932084..9776736909 100644 --- a/lib/odbc/doc/src/databases.xml +++ b/lib/odbc/doc/src/databases.xml @@ -99,7 +99,7 @@ <p>Note that when the value of the data to input is a string, it has to be quoted with <c>'</c>. Example: </p> <code type="none"> -\011odbc:sql_query(Ref, "INSERT INTO EMPLOYEE VALUES(1, 'Jane', 'Doe', 'F')"). +odbc:sql_query(Ref, "INSERT INTO EMPLOYEE VALUES(1, 'Jane', 'Doe', 'F')"). </code> </note> <p>You may also input data using <seealso marker="odbc#param_query">param_query/[3,4]</seealso> and then @@ -198,7 +198,7 @@ when p >= 16 </cell> </row> <row> <cell align="left" valign="middle">SQL_TYPE_TIMESTAMP </cell> - <cell align="left" valign="middle">String </cell> + <cell align="left" valign="middle"> {{YY, MM, DD}, {HH, MM, SS}} </cell> </row> <row> <cell align="left" valign="middle">SQL_LONGVARCHAR </cell> @@ -262,8 +262,8 @@ when p >= 16 </cell> customers of that department. </p> <code type="none"> CREATE PROCEDURE DepartmentInfo (@DepartmentID INT) AS -\011SELECT * FROM Employee WHERE department = @DepartmentID -\011SELECT * FROM Customers WHERE department = @DepartmentID + SELECT * FROM Employee WHERE department = @DepartmentID + SELECT * FROM Customers WHERE department = @DepartmentID </code> </section> diff --git a/lib/odbc/doc/src/getting_started.xml b/lib/odbc/doc/src/getting_started.xml index 864c3a7b65..d543ef64d6 100644 --- a/lib/odbc/doc/src/getting_started.xml +++ b/lib/odbc/doc/src/getting_started.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2002</year><year>2009</year> + <year>2002</year><year>2010</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -13,12 +13,12 @@ compliance with the License. You should have received a copy of the Erlang Public License along with this software. If not, it can be retrieved online at http://www.erlang.org/. - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - + </legalnotice> <title>Getting started</title> @@ -108,15 +108,15 @@ to insert many rows in one go. </p> <code type="none"> 6 > odbc:param_query(Ref,"INSERT INTO EMPLOYEE (NR, FIRSTNAME, " -\011 "LASTNAME, GENDER) VALUES(?, ?, ?, ?)", -\011 [{sql_integer,[2,3,4,5,6,7,8]}, -\011 {{sql_varchar, 20}, + "LASTNAME, GENDER) VALUES(?, ?, ?, ?)", + [{sql_integer,[2,3,4,5,6,7,8]}, + {{sql_varchar, 20}, ["John", "Monica", "Ross", "Rachel", "Piper", "Prue", "Louise"]}, -\011 {{sql_varchar, 20}, + {{sql_varchar, 20}, ["Doe","Geller","Geller", "Green", "Halliwell", "Halliwell", "Lane"]}, -\011 {{sql_char, 1}, ["M","F","M","F","F","F","F"]}]). + {{sql_char, 1}, ["M","F","M","F","F","F","F"]}]). {updated, 7} </code> <p>Fetch all data in the table employee </p> diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml index 29fed0e286..09d78c3248 100644 --- a/lib/odbc/doc/src/notes.xml +++ b/lib/odbc/doc/src/notes.xml @@ -20,7 +20,7 @@ under the License. </legalnotice> - + <title>ODBC Release Notes</title> <prepared>otp_appnotes</prepared> <docno>nil</docno> @@ -30,41 +30,51 @@ </header> <p>This document describes the changes made to the odbc application. </p> - + <section><title>ODBC 2.10.8</title> - - <section><title>Improvements and New Features</title> - <list> - <item> + + <section><title>Improvements and New Features</title> + <list> + <item> <p> - ODBC now handles the types SQL_WCHAR and SQL_WVARCHAR. - ODBC also has a new connection option to return all - strings as binaries and also expect strings to be - binaries in the param_query function. This provides some - but not a full unicode support.</p> + ODBC now handles the types SQL_WCHAR and SQL_WVARCHAR. + Thanks to Juhani R�nkimies. ODBC also has a new + connection option to return all strings as binaries and + also expect strings to be binaries in the param_query + function. These changes provides some unicode support.</p> <p> - Own Id: OTP-7452</p> + Own Id: OTP-7452</p> </item> - </list> - </section> - - </section> - - <section><title>ODBC 2.10.7</title> - - <section><title>Fixed Bugs and Malfunctions</title> - <list> <item> <p> - The odbc application can now be compiled on FreeBSD. - (Thanks to Kenji Rikitake.)</p> + Now supports SQL_TYPE_TIMESTAMP on the format {{YY, MM, + DD}, {HH, MM, SS}}. Thanks to Juhani R�nkimies.</p> + <p> + *** POTENTIAL INCOMPATIBILITY ***</p> <p> - Own Id: OTP-8444</p> + Own Id: OTP-8511</p> </item> </list> </section> +</section> + + <section><title>ODBC 2.10.7</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + The odbc application can now be compiled on FreeBSD. + (Thanks to Kenji Rikitake.)</p> + <p> + Own Id: OTP-8444</p> + </item> + </list> + </section> + + <section><title>Improvements and New Features</title> <list> <item> diff --git a/lib/odbc/doc/src/odbc.xml b/lib/odbc/doc/src/odbc.xml index 3efbac8dd4..70d8cfbe22 100644 --- a/lib/odbc/doc/src/odbc.xml +++ b/lib/odbc/doc/src/odbc.xml @@ -311,7 +311,7 @@ capital letters, alas it is not currently supported by the param_query function. Too know which Erlang data type corresponds to an ODBC data type see the Erlang to ODBC - data type<seealso marker="databases#type">mapping</seealso> in the User's Guide.</p> + data type <seealso marker="databases#type">mapping</seealso> in the User's Guide.</p> </note> </desc> </func> |