Merge branch 'odbc-3.1'

Plus fix for previous commit - one test on Windows wasn't linked against
dbghelp

Author: lawrinn

driver/ma_connection.cpp

@@ -1975,8 +1975,11 @@ SQLRETURN MADB_Dbc::GetInfo(SQLUSMALLINT InfoType, SQLPOINTER InfoValuePtr,
     break;
   case SQL_SCROLL_CONCURRENCY:
     MADB_SET_NUM_VAL(SQLINTEGER, InfoValuePtr, SQL_SCCO_READ_ONLY | SQL_SCCO_OPT_VALUES, StringLengthPtr);
-    break;  
-default:
+    break;
+  case SQL_POSITIONED_STATEMENTS:
+    MADB_SET_NUM_VAL(SQLINTEGER, InfoValuePtr, SQL_PS_POSITIONED_DELETE | SQL_PS_POSITIONED_UPDATE, StringLengthPtr);
+    break;
+  default:
     MADB_SetError(&Error, MADB_ERR_HY096, nullptr, 0);
     return Error.ReturnValue;
   }

test/CMakeLists.txt

@@ -78,9 +78,10 @@ FOREACH (ODBC_TEST ${ODBC_TESTS})
   ADD_EXECUTABLE(odbc_${ODBC_TEST} "${ODBC_TEST}.c" ${COMMON_TEST_SOURCES})
   SET_TARGET_PROPERTIES(odbc_${ODBC_TEST} PROPERTIES
                         LANGUAGE C)
-  TARGET_LINK_LIBRARIES(odbc_${ODBC_TEST} -rdynamic)
   IF (WIN32)
     TARGET_LINK_LIBRARIES(odbc_${ODBC_TEST} dbghelp)
+  ELSE()
+    TARGET_LINK_LIBRARIES(odbc_${ODBC_TEST} -rdynamic)
   ENDIF()
   IF (DIRECT_LINK_TESTS)
     TARGET_LINK_LIBRARIES(odbc_${ODBC_TEST} maodbc ${PLATFORM_DEPENDENCIES})
@@ -96,6 +97,10 @@ ENDFOREACH()
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/driver)
 ADD_EXECUTABLE(odbc_connstring connstring.c ${CMAKE_SOURCE_DIR}/driver/ma_dsn.c ${COMMON_TEST_SOURCES})
 TARGET_LINK_LIBRARIES(odbc_connstring ${ODBC_LIBS} ${ODBC_INSTLIBS} mariadbclient ${PLATFORM_DEPENDENCIES})
+IF (WIN32)
+  TARGET_LINK_LIBRARIES(odbc_connstring dbghelp)
+ENDIF()
+
 ADD_TEST(odbc_connstring ${EXECUTABLE_OUTPUT_PATH}/odbc_connstring)
 SET_TESTS_PROPERTIES(odbc_connstring PROPERTIES TIMEOUT 120)
 SET_TESTS_PROPERTIES(odbc_basic odbc_catalog2 odbc_cursor odbc_multistatement  PROPERTIES TIMEOUT 450)

test/info.c

@@ -873,6 +873,7 @@ ODBC_TEST(odbc313)
   return OK;
 }
 
+/* We returned incorrect max size for SQL_VARCHAR/SQL_VARBINARY */
 ODBC_TEST(odbc430)
 {
   CHECK_STMT_RC(Stmt, SQLGetTypeInfo(Stmt, SQL_VARCHAR));
@@ -911,6 +912,16 @@ ODBC_TEST(driver_ver)
 }
 
 
+ODBC_TEST(odbc475)
+{
+  SQLINTEGER info= 0;
+  CHECK_DBC_RC(Connection, SQLGetInfo(Connection, SQL_POSITIONED_STATEMENTS, &info, 0, NULL));
+  is_num(SQL_PS_POSITIONED_DELETE | SQL_PS_POSITIONED_UPDATE, info);
+
+  return OK;
+}
+
+
 MA_ODBC_TESTS my_tests[]=
 {
   { t_gettypeinfo, "t_gettypeinfo", NORMAL },
@@ -938,6 +949,7 @@ MA_ODBC_TESTS my_tests[]=
   { odbc313, "odbc313", NORMAL },
   { odbc430, "odbc430", NORMAL },
   { driver_ver, "driver_ver_not_trimmed", NORMAL },
+  { odbc475, "odbc476_SQL_POSITIONED_STATEMENTS", NORMAL },
   { NULL, NULL }
 };