Fix of the build for not ODBC 3.8 DM's(read iOdbc) and new header

packaging.

In the commit introdusing mariadb specific attributes were also added
checks and correct sql states for unknown attributes from DS specific
range. This used definition that is not present in iOdbc
Since iOdbc does not really support ODBC 3.8 that header is not really
needed. But for the case of direct linking it may be still useful.

Author: lawrinn

driver/ma_connection.cpp

@@ -355,11 +355,13 @@ SQLRETURN MADB_Dbc::SetAttr(SQLINTEGER Attribute, SQLPOINTER ValuePtr, SQLINTEGE
     PrepareOnClient= ((SQLULEN)ValuePtr != SQL_FALSE);
     break;
   default:
+#ifdef SQL_DRIVER_CONN_ATTR_BASE
     if (Attribute >= SQL_DRIVER_CONN_ATTR_BASE)
     {
       // The error is for unknown by us attributes from driver specific attributes range
       return MADB_SetError(&Error, MADB_ERR_HYC00, nullptr, 0);
     }
+#endif
     break;
   }
   return Error.ReturnValue;
@@ -486,11 +488,14 @@ SQLRETURN MADB_Dbc::GetAttr(SQLINTEGER Attribute, SQLPOINTER ValuePtr, SQLINTEGE
     *(SQLULEN*)ValuePtr= PrepareOnClient ? SQL_TRUE : SQL_FALSE;
     break;
   default:
+// Basically - is DM is not ODBC 3.8
+#ifdef SQL_DRIVER_CONN_ATTR_BASE
     if (Attribute >= SQL_DRIVER_CONN_ATTR_BASE && Attribute < 0x00008000)
     {
       // The error is for unknown by us attributes from driver specific attributes range
       return MADB_SetError(&Error, MADB_ERR_HYC00, nullptr, 0);
     }
+#endif
     return MADB_SetError(&Error, MADB_ERR_HY024, nullptr, 0);
   }
   return Error.ReturnValue;

driver/ma_statement.cpp

@@ -2348,11 +2348,13 @@ SQLRETURN MADB_StmtGetAttr(MADB_Stmt *Stmt, SQLINTEGER Attribute, SQLPOINTER Val
     *(SQLULEN*)ValuePtr= Stmt->Options.PrepareOnClient ? SQL_TRUE : SQL_FALSE;
     break;
   default:
+#ifdef SQL_DRIVER_CONN_ATTR_BASE
     if (Attribute >= SQL_DRIVER_CONN_ATTR_BASE && Attribute < 0x00008000)
     {
       // The error is for unknown by us attributes from driver specific attributes range
       return MADB_SetError(&Stmt->Error, MADB_ERR_HYC00, nullptr, 0);
     }
+#endif
     // Should probably return error here as in other Attr functions, but not gonna change that
     // in GA. TODO: for 3.3 of will it be 4.0
 
@@ -2582,11 +2584,13 @@ SQLRETURN MADB_StmtSetAttr(MADB_Stmt *Stmt, SQLINTEGER Attribute, SQLPOINTER Val
     Stmt->Options.PrepareOnClient= ((SQLULEN)ValuePtr != SQL_FALSE);
     break;
   default:
+#ifdef SQL_DRIVER_CONN_ATTR_BASE
     if (Attribute >= SQL_DRIVER_CONN_ATTR_BASE && Attribute < 0x00008000)
     {
       // The error is for unknown by us attributes from driver specific attributes range
       return MADB_SetError(&Stmt->Error, MADB_ERR_HYC00, nullptr, 0);
     }
+#endif
     // HY024(that was here before) does not look correct - it's about wrong value, and not attribute. HY092 is also for DM
     // But for the case of direct linking it looks legit.
     return MADB_SetError(&Stmt->Error, MADB_ERR_HY024, nullptr, 0);

packaging/macos/CMakeLists.txt

@@ -66,6 +66,8 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/distribution.plist.in
                ${CMAKE_CURRENT_BINARY_DIR}/distribution.plist @ONLY)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build_package.sh.in
                ${CMAKE_CURRENT_BINARY_DIR}/build_package.sh @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/copy_package_files.sh.in
+               ${CMAKE_CURRENT_BINARY_DIR}/copy_package_files.sh @ONLY)
 
 ADD_EXECUTABLE(install_driver install_driver.c)
 TARGET_LINK_LIBRARIES(install_driver ${ODBC_INSTLIBS})
@@ -88,7 +90,7 @@ ENDIF()
 
 IF(USE_SYSTEM_INSTALLED_LIB)
   ADD_CUSTOM_TARGET(copypkgfiles
-                  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/copy_package_files.sh $<TARGET_FILE_DIR:maodbc> $<TARGET_FILE_DIR:install_driver>
+                  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/copy_package_files.sh $<TARGET_FILE_DIR:maodbc> $<TARGET_FILE_DIR:install_driver>
                   DEPENDS maodbc install_driver
                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 ELSE()
@@ -98,7 +100,7 @@ ELSE()
     MESSAGE(STATUS "Configuring to include gnutls library(${GNUTLS_LIB}) into the package")
   ENDIF()
   ADD_CUSTOM_TARGET(copypkgfiles
-                  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/copy_package_files.sh $<TARGET_FILE_DIR:maodbc> $<TARGET_FILE_DIR:install_driver> $<TARGET_FILE_DIR:dialog> ${GNUTLS_LIB}
+                  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/copy_package_files.sh $<TARGET_FILE_DIR:maodbc> $<TARGET_FILE_DIR:install_driver> $<TARGET_FILE_DIR:dialog> ${GNUTLS_LIB}
                   DEPENDS maodbc install_driver
                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 ENDIF()

packaging/macos/copy_package_files.sh renamed to packaging/macos/copy_package_files.sh.in

@@ -19,7 +19,7 @@
 # *************************************************************************************/
 
 LibPath="Library/MariaDB/MariaDB-Connector-ODBC"
-
+SourceRootDir=@CMAKE_SOURCE_DIR@
 set -e
 rm -rf ./ROOT
 
@@ -30,7 +30,8 @@ cp $2//install_driver ./ROOT/${LibPath}/bin
 CURRENTDIR=$(dirname "$0")
 
 mkdir -p ./ROOT/${LibPath}/include/mariadb
-cp $SRCROOTDIR/../../include/mariadb/sqlmariadb.h ./ROOT/${LibPath}/include/mariadb/
+cp $SourceRootDir/include/mariadb/sqlmariadb.h ./ROOT/${LibPath}/include/mariadb/
+
 if [ $3 ]; then
   mkdir ./ROOT/${LibPath}/plugin
   cp $3/dialog.so ./ROOT/${LibPath}/plugin/