Remove version from the driver name

Summary: In order to make upgrade of the ODBC driver easier for customers, we remove version from the driver name as it appears in ODBC data source configuration files. Test Plan: CircleCI https://app.circleci.com/pipelines/github/memsql/singlestore-odbc-connector/1954/workflows/d9b90af4-7d7a-413a-83a7-6d84137f3eb8 Reviewers: amakarovych-ua Reviewed By: amakarovych-ua Subscribers: engineering-list Differential Revision: https://grizzly.internal.memcompute.com/D52916
memsql · Nov 18, 2021 · 407ab85 · 407ab85
1 parent 043cbc0
commit 407ab85
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 41 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -335,7 +335,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.5.6-9e799dbf4f-3.2.11-1.11.10
               with_sanitizer:
@@ -353,7 +353,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.5.6-9e799dbf4f-3.2.11-1.11.10
       - build-ubuntu:
@@ -369,7 +369,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.5.6-9e799dbf4f-3.2.11-1.11.10
       - build-macos:
@@ -381,7 +381,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               driver_name:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
               driver_type:
                 - ansi
       - build-windows:
@@ -393,7 +393,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
               driver_type:
                 - unicode
       - build-macos:
@@ -405,7 +405,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               driver_name:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
               driver_type:
                 - unicode
       - build-windows:
@@ -417,7 +417,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
               driver_type:
                 - ansi
   daily:
@@ -442,7 +442,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.5.6-9e799dbf4f-3.2.11-1.11.10
               with_sanitizer:
@@ -460,7 +460,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.5.6-9e799dbf4f-3.2.11-1.11.10
       - build-ubuntu:
@@ -476,7 +476,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.5.6-9e799dbf4f-3.2.11-1.11.10
       - build-ubuntu:
@@ -492,7 +492,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.3.2-a364d4b31f-3.0.0-1.9.3
       - build-ubuntu:
@@ -508,7 +508,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.1.13-11ddea2a3a-3.0.0-1.9.3
       - build-ubuntu:
@@ -524,7 +524,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.0.15-619d118712-1.9.5-1.5.0
       - build-ubuntu:
@@ -540,7 +540,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.3.2-a364d4b31f-3.0.0-1.9.3
       - build-ubuntu:
@@ -556,7 +556,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.1.13-11ddea2a3a-3.0.0-1.9.3
       - build-ubuntu:
@@ -572,7 +572,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.0.15-619d118712-1.9.5-1.5.0
       - build-linux-in-docker:
@@ -586,7 +586,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
       - build-linux-in-docker:
           requires:
             - build-debian-8-unicode-RelWithDebInfo
@@ -600,7 +600,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
       - build-linux-in-docker:
           requires:
             - build-debian-8-ansi-RelWithDebInfo
@@ -614,7 +614,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
       - build-linux-in-docker:
           requires:
             - build-debian-9-unicode-RelWithDebInfo
@@ -628,7 +628,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
       - build-linux-in-docker:
           requires:
             - build-debian-9-ansi-RelWithDebInfo
@@ -642,7 +642,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
       - build-linux-in-docker:
           requires:
             - build-debian-10-unicode-RelWithDebInfo
@@ -656,7 +656,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
       - build-linux-in-docker:
           requires:
             - build-debian-10-ansi-RelWithDebInfo
@@ -670,7 +670,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
       - build-linux-in-docker:
           requires:
             - build-centos-7-unicode-RelWithDebInfo
@@ -684,7 +684,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
       - build-linux-in-docker:
           requires:
             - build-centos-7-ansi-RelWithDebInfo
@@ -698,7 +698,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
       - build-linux-in-docker:
           requires:
             - build-centos-8-unicode-RelWithDebInfo
@@ -712,7 +712,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
       - build-macos:
           requires:
             - build-centos-8-ansi-RelWithDebInfo
@@ -724,7 +724,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               driver_name:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
               driver_type:
                 - unicode
       - build-macos:
@@ -738,7 +738,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               driver_name:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
               driver_type:
                 - ansi
       - build-windows:
@@ -752,7 +752,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
+                - SingleStore ODBC Unicode Driver
               driver_type:
                 - unicode
       - build-windows:
@@ -766,7 +766,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
+                - SingleStore ODBC ANSI Driver
               driver_type:
                 - ansi
   publish:

diff --git a/.run/odbc_error.run.xml b/.run/odbc_error.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="odbc_error" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" WORKING_DIR="file://$CMakeCurrentGenerationDir$" PASS_PARENT_ENVS_2="true" PROJECT_NAME="singlestore_connector_odbc" TARGET_NAME="odbc_error" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="singlestore_connector_odbc" RUN_TARGET_NAME="odbc_error">
     <envs>
       <env name="ODBCINI" value="./test/odbc.ini" />
-      <env name="ODBCINSTINI" value="./test/odbcinst.ini" />
+      <env name="ODBCSYSINI" value="./test" />
     </envs>
     <method v="2">
       <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -570,7 +570,7 @@ IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
         math(EXPR DRIVERS_COUNT "${idx}+1")
 
         # Configuring ini files for testing with UnixODBC
-        SET(TEST_DRIVER "SingleStore ODBC ${CPACK_PACKAGE_VERSION} ${DRIVER_TYPE} Driver")
+        SET(TEST_DRIVER "SingleStore ODBC ${DRIVER_TYPE} Driver")
         SET(TEST_DESCRIPTION "SingleStore ODBC ${CPACK_PACKAGE_VERSION} ${DRIVER_TYPE} Connector")
 
         MESSAGE(STATUS "Configuring Test Driver: ${TEST_DRIVER}, Test DSN: ${dsn_name}_${CONNECTOR_DRIVER_TYPE_SHORT}, tcp://${TEST_UID}@${TEST_SERVER}:${TEST_PORT}/${TEST_SCHEMA} socket: ${TEST_SOCKET}")

diff --git a/osxinstall/scripts/postinstall.in b/osxinstall/scripts/postinstall.in
@@ -68,15 +68,15 @@ if [ ! -f $ODBCINSTINI ] ; then
   echo "TraceFile = /tmp/iodbc_trace.log" >> $ODBCINSTINI
   echo "" >> $ODBCINSTINI
   echo "[ODBC Drivers]" >> $ODBCINSTINI
-  echo "SingleStore ODBC @PRODUCT_VERSION@ Unicode Driver = Installed" >> $ODBCINSTINI
-  echo "SingleStore ODBC @PRODUCT_VERSION@ ANSI Driver = Installed" >> $ODBCINSTINI
+  echo "SingleStore ODBC Unicode Driver = Installed" >> $ODBCINSTINI
+  echo "SingleStore ODBC ANSI Driver = Installed" >> $ODBCINSTINI
   echo "" >> $ODBCINSTINI
-  echo "[SingleStore ODBC @PRODUCT_VERSION@ Unicode Driver]" >> $ODBCINSTINI
+  echo "[SingleStore ODBC Unicode Driver]" >> $ODBCINSTINI
   echo "Driver      = ${target}Library/SingleStore/SingleStore-Connector-ODBC/libssodbcw.dylib" >> $ODBCINSTINI
   echo "Description = SingleStore Connector/ODBC(Unicode) @PRODUCT_VERSION@ @PRODUCT_ARCH_BITS@bit" >> $ODBCINSTINI
   echo "Threading   = 0" >> $ODBCINSTINI
   echo "" >> $ODBCINSTINI
-  echo "[SingleStore ODBC @PRODUCT_VERSION@ ANSI Driver]" >> $ODBCINSTINI
+  echo "[SingleStore ODBC ANSI Driver]" >> $ODBCINSTINI
   echo "Driver      = ${target}Library/SingleStore/SingleStore-Connector-ODBC/libssodbca.dylib" >> $ODBCINSTINI
   echo "Description = SingleStore Connector/ODBC(ANSI) @PRODUCT_VERSION@ @PRODUCT_ARCH_BITS@bit" >> $ODBCINSTINI
   echo "Threading   = 0" >> $ODBCINSTINI
@@ -86,8 +86,8 @@ if [ ! -f $ODBCINSTINI ] ; then
   exit 0
 fi
 
-${target}Library/SingleStore/SingleStore-Connector-ODBC/bin/install_driver "${target}Library/SingleStore/SingleStore-Connector-ODBC/libssodbca.dylib" "SingleStore ODBC @PRODUCT_VERSION@ ANSI Driver" "SingleStore Connector/ODBC(ANSI) @PRODUCT_VERSION@ @PRODUCT_ARCH_BITS@bit" >> /tmp/ssodbc_postinstall.log
-${target}Library/SingleStore/SingleStore-Connector-ODBC/bin/install_driver "${target}Library/SingleStore/SingleStore-Connector-ODBC/libssodbcw.dylib" "SingleStore ODBC @PRODUCT_VERSION@ Unicode Driver" "SingleStore Connector/ODBC(Unicode) @PRODUCT_VERSION@ @PRODUCT_ARCH_BITS@bit" >> /tmp/ssodbc_postinstall.log
+${target}Library/SingleStore/SingleStore-Connector-ODBC/bin/install_driver "${target}Library/SingleStore/SingleStore-Connector-ODBC/libssodbca.dylib" "SingleStore ODBC ANSI Driver" "SingleStore Connector/ODBC(ANSI) @PRODUCT_VERSION@ @PRODUCT_ARCH_BITS@bit" >> /tmp/ssodbc_postinstall.log
+${target}Library/SingleStore/SingleStore-Connector-ODBC/bin/install_driver "${target}Library/SingleStore/SingleStore-Connector-ODBC/libssodbcw.dylib" "SingleStore ODBC Unicode Driver" "SingleStore Connector/ODBC(Unicode) @PRODUCT_VERSION@ @PRODUCT_ARCH_BITS@bit" >> /tmp/ssodbc_postinstall.log
 
 echo "Registration has been successfully finished" >> /tmp/ssodbc_postinstall.log
 

diff --git a/test/tap.h b/test/tap.h
@@ -132,7 +132,7 @@ static SQLCHAR *my_dsn=             (SQLCHAR *)"ssodbc_test_a";
 static SQLCHAR *my_uid=             (SQLCHAR *)"root";
 static SQLCHAR *my_pwd=             (SQLCHAR *)"";
 static SQLCHAR *my_schema=          (SQLCHAR *)"odbc_test";
-static SQLCHAR *my_drivername=      (SQLCHAR *)"SingleStore ODBC 1.0.6 ANSI Driver";
+static SQLCHAR *my_drivername=      (SQLCHAR *)"SingleStore ODBC ANSI Driver";
 static SQLCHAR *my_servername=      (SQLCHAR *)"127.0.0.1";
 static SQLCHAR *add_connstr=        (SQLCHAR*)"";
 

diff --git a/wininstall/mariadb_odbc.xml.in b/wininstall/mariadb_odbc.xml.in
@@ -62,13 +62,13 @@
     </Component>
     <Component Id="DriverA" Guid="@GUID_DRIVER_A@" SharedDllRefCount="yes" Directory="INSTALLFOLDER" Win64="@IS_WIN64@">
       <File Id="singlestore_odbc_a_dll" Name="ssodbca.dll" KeyPath="yes" DiskId="1" Source="$(var.binaries_dir)/ssodbca.dll">
-        <ODBCDriver Id="madb_odbc_driver_a" Name="SingleStore ODBC @PRODUCT_VERSION@ ANSI Driver" SetupFile="singlestore_odbc_setup" />
+        <ODBCDriver Id="madb_odbc_driver_a" Name="SingleStore ODBC ANSI Driver" SetupFile="singlestore_odbc_setup" />
       </File>
       <File Id="singlestore_odbc_lib" Name="ssodbca.lib" DiskId="1" Source="$(var.binaries_dir)/ssodbca.lib" />
     </Component>
     <Component Id="DriverW" Guid="@GUID_DRIVER_W@" SharedDllRefCount="yes" Directory="INSTALLFOLDER" Win64="@IS_WIN64@">
       <File Id="singlestore_odbc_w_dll" Name="ssodbcw.dll" KeyPath="yes" DiskId="1" Source="$(var.binaries_dir)/ssodbcw.dll">
-        <ODBCDriver Id="madb_odbc_driver_w" Name="SingleStore ODBC @PRODUCT_VERSION@ Unicode Driver" SetupFile="singlestore_odbc_setup" />
+        <ODBCDriver Id="madb_odbc_driver_w" Name="SingleStore ODBC Unicode Driver" SetupFile="singlestore_odbc_setup" />
       </File>
       <File Id="singlestore_w_odbc_lib" Name="ssodbcw.lib" DiskId="1" Source="$(var.binaries_dir)/ssodbcw.lib" />
     </Component>