Revert "Remove version from the driver name"

This reverts commit 407ab85.
memsql · Mar 30, 2022 · 62ad228 · 62ad228
1 parent f1c19af
commit 62ad228
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 38 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -322,7 +322,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.6.5-018454f4e3-4.0.1-1.13.0
               with_sanitizer:
@@ -338,7 +338,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.6.5-018454f4e3-4.0.1-1.13.0
       - build-ubuntu:
@@ -352,7 +352,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.6.5-018454f4e3-4.0.1-1.13.0
       - build-macos:
@@ -364,7 +364,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               driver_name:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
               driver_type:
                 - ansi
       - build-windows:
@@ -376,7 +376,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
               driver_type:
                 - unicode
       - build-macos:
@@ -388,7 +388,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               driver_name:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
               driver_type:
                 - unicode
       - build-windows:
@@ -400,7 +400,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
               driver_type:
                 - ansi
   daily:
@@ -423,7 +423,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.6.5-018454f4e3-4.0.1-1.13.0
               with_sanitizer:
@@ -439,7 +439,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.6.5-018454f4e3-4.0.1-1.13.0
       - build-ubuntu:
@@ -453,7 +453,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.6.5-018454f4e3-4.0.1-1.13.0
       - build-ubuntu:
@@ -481,7 +481,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.3.2-a364d4b31f-3.0.0-1.9.3
       - build-ubuntu:
@@ -495,7 +495,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.1.13-11ddea2a3a-3.0.0-1.9.3
       - build-ubuntu:
@@ -523,7 +523,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.3.2-a364d4b31f-3.0.0-1.9.3
       - build-ubuntu:
@@ -537,7 +537,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
               memsql_image:
                 - memsql/cluster-in-a-box:centos-7.1.13-11ddea2a3a-3.0.0-1.9.3
       - build-linux-in-docker:
@@ -551,7 +551,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
       - build-linux-in-docker:
           requires:
             - build-debian-8-unicode-RelWithDebInfo
@@ -565,7 +565,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
       - build-linux-in-docker:
           requires:
             - build-debian-8-ansi-RelWithDebInfo
@@ -579,7 +579,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
       - build-linux-in-docker:
           requires:
             - build-debian-9-unicode-RelWithDebInfo
@@ -593,7 +593,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
       - build-linux-in-docker:
           requires:
             - build-debian-9-ansi-RelWithDebInfo
@@ -607,7 +607,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
       - build-linux-in-docker:
           requires:
             - build-debian-10-unicode-RelWithDebInfo
@@ -621,7 +621,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
       - build-linux-in-docker:
           requires:
             - build-debian-10-ansi-RelWithDebInfo
@@ -635,7 +635,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
       - build-linux-in-docker:
           requires:
             - build-centos-7-unicode-RelWithDebInfo
@@ -649,7 +649,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
       - build-linux-in-docker:
           requires:
             - build-centos-7-ansi-RelWithDebInfo
@@ -663,7 +663,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
       - build-linux-in-docker:
           requires:
             - build-centos-8-unicode-RelWithDebInfo
@@ -677,7 +677,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
       - build-macos:
           requires:
             - build-centos-8-ansi-RelWithDebInfo
@@ -689,7 +689,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               driver_name:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
               driver_type:
                 - unicode
       - build-macos:
@@ -703,7 +703,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               driver_name:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
               driver_type:
                 - ansi
       - build-windows:
@@ -717,7 +717,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_w
               test_driver:
-                - SingleStore ODBC Unicode Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> Unicode Driver
               driver_type:
                 - unicode
       - build-windows:
@@ -731,7 +731,7 @@ workflows:
               test_dsn:
                 - ssodbc_test_a
               test_driver:
-                - SingleStore ODBC ANSI Driver
+                - SingleStore ODBC << pipeline.parameters.driver-version >> ANSI Driver
               driver_type:
                 - ansi
   publish:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -572,7 +572,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 ${DRIVER_TYPE} Driver")
+        SET(TEST_DRIVER "SingleStore ODBC ${CPACK_PACKAGE_VERSION} ${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 Unicode Driver = Installed" >> $ODBCINSTINI
-  echo "SingleStore ODBC ANSI Driver = Installed" >> $ODBCINSTINI
+  echo "SingleStore ODBC @PRODUCT_VERSION@ Unicode Driver = Installed" >> $ODBCINSTINI
+  echo "SingleStore ODBC @PRODUCT_VERSION@ ANSI Driver = Installed" >> $ODBCINSTINI
   echo "" >> $ODBCINSTINI
-  echo "[SingleStore ODBC Unicode Driver]" >> $ODBCINSTINI
+  echo "[SingleStore ODBC @PRODUCT_VERSION@ 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 ANSI Driver]" >> $ODBCINSTINI
+  echo "[SingleStore ODBC @PRODUCT_VERSION@ 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 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
+${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
 
 echo "Registration has been successfully finished" >> /tmp/ssodbc_postinstall.log 2>&1
 

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 ANSI Driver";
+static SQLCHAR *my_drivername=      (SQLCHAR *)"SingleStore ODBC 1.0.6 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 ANSI Driver" SetupFile="singlestore_odbc_setup" />
+        <ODBCDriver Id="madb_odbc_driver_a" Name="SingleStore ODBC @PRODUCT_VERSION@ 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 Unicode Driver" SetupFile="singlestore_odbc_setup" />
+        <ODBCDriver Id="madb_odbc_driver_w" Name="SingleStore ODBC @PRODUCT_VERSION@ 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>