From 6f5a8b438a92ae66b4aa02a97a2aae993c8b7da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Fri, 2 Sep 2011 16:23:26 +0200 Subject: odbc/c_src/Makefile.in: Support parallel make Force early creation of directories. See 8d3a2dfa646ab2ceb41905c673adb15e57bf9cfd for more details. --- lib/odbc/c_src/Makefile.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lib/odbc') diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in index ed3eeb1d42..dda896bcd2 100644 --- a/lib/odbc/c_src/Makefile.in +++ b/lib/odbc/c_src/Makefile.in @@ -89,9 +89,10 @@ TARGET_FLAGS = @TARGET_FLAGS@ # ---------------------------------------------------- # Targets # ---------------------------------------------------- +_create_dirs := $(shell mkdir -p $(OBJ_DIR) $(BIN_DIR)) ifdef EXE_TARGET -opt debug: create_dirs $(EXE_TARGET) +opt debug: $(EXE_TARGET) else opt debug: endif @@ -119,10 +120,6 @@ endif $(OBJ_DIR)/odbcserver.o: odbcserver.c $(CC) $(CFLAGS) $(INCLUDES) $(TARGET_FLAGS) -o $@ -c odbcserver.c -create_dirs: - $(INSTALL_DIR) $(OBJ_DIR) - $(INSTALL_DIR) $(BIN_DIR) - # ---------------------------------------------------- # Release Target # ---------------------------------------------------- -- cgit v1.2.3 From ee205b29f7a2bb92aeef55ca88fccc8c91f22ec0 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Mon, 19 Sep 2011 15:36:08 +0200 Subject: Correct XML files --- lib/odbc/doc/src/odbc.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/odbc') diff --git a/lib/odbc/doc/src/odbc.xml b/lib/odbc/doc/src/odbc.xml index 11ca97f743..8a58dc2848 100644 --- a/lib/odbc/doc/src/odbc.xml +++ b/lib/odbc/doc/src/odbc.xml @@ -4,7 +4,7 @@
- 19992010 + 19992011 Ericsson AB. All Rights Reserved. @@ -138,7 +138,7 @@ Opens a connection to the database. ConnectStr = string() - An example of a connection string:"DSN=sql-server;UID=aladdin;PWD=sesame"where DSN is your ODBC Data Source Name, UID is a database user id and PWD is the password for that user. These are usually the attributes required in the connection string, but some drivers have other driver specific attributes, for example"DSN=Oracle8;DBQ=gandalf;UID=aladdin;PWD=sesame"where DBQ is your TNSNAMES.ORA entry name e.g. some Oracle specific configuration attribute. + An example of a connection string: "DSN=sql-server;UID=aladdin;PWD=sesame" where DSN is your ODBC Data Source Name, UID is a database user id and PWD is the password for that user. These are usually the attributes required in the connection string, but some drivers have other driver specific attributes, for example "DSN=Oracle8;DBQ=gandalf;UID=aladdin;PWD=sesame" where DBQ is your TNSNAMES.ORA entry name e.g. some Oracle specific configuration attribute. Options = [] | [option()] All options has default values. option() = {auto_commit, on | off} | {timeout, milliseconds()} @@ -432,7 +432,7 @@

Selects N consecutive rows of the result set. If Position is next it is semantically equivalent - of calling next/[1,2]N times. If + of calling next/[1,2] N times. If Position is {relative, Pos}, Pos will be used as an offset from the current cursor position to determine the first selected row. If Position is -- cgit v1.2.3 From 101d00d11e4e2c24cc5d54739e348aa34527e315 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Thu, 22 Sep 2011 10:16:59 +0200 Subject: Temporary disable tests on MAC due to issus with the MAC ODBC drivers --- lib/odbc/test/odbc_test_lib.erl | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'lib/odbc') diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl index 4d7d1ae2fa..a8439d5fb6 100644 --- a/lib/odbc/test/odbc_test_lib.erl +++ b/lib/odbc/test/odbc_test_lib.erl @@ -36,18 +36,25 @@ match_float(Float, Match, Delta) -> (Float < Match + Delta) and (Float > Match - Delta). odbc_check() -> - case erlang:system_info({wordsize, external}) of - 4 -> - ok; - Other -> - case os:type() of - {unix, linux} -> + case os:type() of + {unix,darwin} -> + lists:flatten( + io_lib:format("Currently we have no working drivers for MAC", + [])); + _ -> + case erlang:system_info({wordsize, external}) of + 4 -> ok; - Platform -> - lists:flatten( - io_lib:format("Word on platform ~w size" - " ~w not supported", [Other, - Platform])) + Other -> + case os:type() of + {unix, linux} -> + ok; + Platform -> + lists:flatten( + io_lib:format("Word on platform ~w size" + " ~w not supported", [Other, + Platform])) + end end end. -- cgit v1.2.3 From 5acac472723ef5cac6a944caf7b7ec4320c003e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= Date: Thu, 29 Sep 2011 18:10:19 +0200 Subject: Update copyright years --- lib/odbc/c_src/odbcserver.h | 2 +- lib/odbc/doc/src/databases.xml | 2 +- lib/odbc/src/odbc_internal.hrl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/odbc') diff --git a/lib/odbc/c_src/odbcserver.h b/lib/odbc/c_src/odbcserver.h index 314fbf32c6..56b6148777 100644 --- a/lib/odbc/c_src/odbcserver.h +++ b/lib/odbc/c_src/odbcserver.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2002-2010. All Rights Reserved. + * Copyright Ericsson AB 2002-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in diff --git a/lib/odbc/doc/src/databases.xml b/lib/odbc/doc/src/databases.xml index 09f5a5af5b..34e1d51255 100644 --- a/lib/odbc/doc/src/databases.xml +++ b/lib/odbc/doc/src/databases.xml @@ -4,7 +4,7 @@

- 20022010 + 20022011 Ericsson AB. All Rights Reserved. diff --git a/lib/odbc/src/odbc_internal.hrl b/lib/odbc/src/odbc_internal.hrl index c0e7d9657b..bd80cdc659 100644 --- a/lib/odbc/src/odbc_internal.hrl +++ b/lib/odbc/src/odbc_internal.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2010. All Rights Reserved. +%% Copyright Ericsson AB 2002-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in -- cgit v1.2.3 From b6dc1a844eab061d0a7153d46e7e68296f15a504 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Tue, 4 Oct 2011 12:06:58 +0200 Subject: Prepare release --- lib/odbc/doc/src/notes.xml | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'lib/odbc') diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml index e15e7dea7d..9c6ca8a017 100644 --- a/lib/odbc/doc/src/notes.xml +++ b/lib/odbc/doc/src/notes.xml @@ -31,7 +31,49 @@

This document describes the changes made to the odbc application.

-
ODBC 2.10.10 +
ODBC 2.10.11 + +
Fixed Bugs and Malfunctions + + +

+ When using output parameters the internal odbc state was + not correctly cleaned causing the next call to + param_query to misbehave.

+

+ Own Id: OTP-9444

+ + +

XML files have been corrected.

+

+ Own Id: OTP-9550 Aux Id: OTP-9541

+ + +
+ + +
Improvements and New Features + + +

+ Add code to handle old ODBC drivers on solaris. Also adds + tests with MySQL.

+

+ Own Id: OTP-8407

+ + +

+ Odbc now supports SQL_WLONGVARCHAR, thanks to Hanfei Shen + for the patch.

+

+ Own Id: OTP-8493

+ + +
+ +
+ +
ODBC 2.10.10
Fixed Bugs and Malfunctions -- cgit v1.2.3