tiny_tds 2.1.6-x64-mingw-ucrt → 3.0.0-x64-mingw-ucrt

data/Rakefile

@@ -7,14 +7,10 @@ require_relative './ext/tiny_tds/extconsts'
 
 SPEC = Gem::Specification.load(File.expand_path('../tiny_tds.gemspec', __FILE__))
 
-ruby_cc_ucrt_versions = "3.2.0:3.1.0".freeze
-ruby_cc_mingw32_versions = "3.0.0:2.7.0:2.6.0:2.5.0:2.4.0".freeze
+ruby_cc_ucrt_versions = "3.3.0:3.2.0:3.1.0".freeze
+ruby_cc_mingw32_versions = "3.0.0:2.7.0".freeze
 
 GEM_PLATFORM_HOSTS = {
-  'x86-mingw32' => {
-    host: 'i686-w64-mingw32',
-    ruby_versions: ruby_cc_mingw32_versions
-  },
   'x64-mingw32' => {
     host: 'x86_64-w64-mingw32',
     ruby_versions: ruby_cc_mingw32_versions

data/VERSION

@@ -1 +1 @@
-2.1.6
+3.0.0

data/docker-compose.yml

@@ -5,11 +5,11 @@ networks:
 
 services:
   mssql:
-    image: metaskills/mssql-server-linux-tinytds:2017-GA
+    image: mcr.microsoft.com/mssql/server:${MSSQL_VERSION:-2017}-latest
     container_name: sqlserver
     environment:
       ACCEPT_EULA: Y
-      SA_PASSWORD: super01S3cUr3
+      MSSQL_SA_PASSWORD: super01S3cUr3
     ports:
       - "1433:1433"
     network_mode: "host"

data/ext/tiny_tds/client.c

@@ -299,8 +299,7 @@ static VALUE rb_tinytds_execute(VALUE self, VALUE sql) {
   REQUIRE_OPEN_CLIENT(cwrap);
   dbcmd(cwrap->client, StringValueCStr(sql));
   if (dbsqlsend(cwrap->client) == FAIL) {
-    rb_warn("TinyTds: dbsqlsend() returned FAIL.\n");
-    return Qfalse;
+    rb_raise(cTinyTdsError, "failed dbsqlsend() function");
   }
   cwrap->userdata->dbsql_sent = 1;
   result = rb_tinytds_new_result_obj(cwrap);
@@ -404,17 +403,15 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
       #endif
     }
   }
-  #ifdef DBSETUTF16
-    if (use_utf16 == Qtrue)  { DBSETLUTF16(cwrap->login, 1); }
-    if (use_utf16 == Qfalse) { DBSETLUTF16(cwrap->login, 0); }
-  #else
-    if (use_utf16 == Qtrue || use_utf16 == Qfalse) {
-      rb_warning("TinyTds: Please consider upgrading to FreeTDS 0.99 or higher for better unicode support.\n");
-    }
-  #endif
+  if (use_utf16 == Qtrue)  { DBSETLUTF16(cwrap->login, 1); }
+  if (use_utf16 == Qfalse) { DBSETLUTF16(cwrap->login, 0); }
 
   cwrap->client = dbopen(cwrap->login, StringValueCStr(dataserver));
   if (cwrap->client) {
+    if (dbtds(cwrap->client) < 11) {
+      rb_raise(cTinyTdsError, "connecting with a TDS version older than 7.3!");
+    }
+
     VALUE transposed_encoding, timeout_string;
 
     cwrap->closed = 0;
@@ -435,11 +432,7 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
     }
     transposed_encoding = rb_funcall(cTinyTdsClient, intern_transpose_iconv_encoding, 1, charset);
     cwrap->encoding = rb_enc_find(StringValueCStr(transposed_encoding));
-    if (dbtds(cwrap->client) <= 7) {
-      cwrap->identity_insert_sql = "SELECT CAST(@@IDENTITY AS bigint) AS Ident";
-    } else {
-      cwrap->identity_insert_sql = "SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident";
-    }
+    cwrap->identity_insert_sql = "SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident";
   }
   return self;
 }

data/ext/tiny_tds/extconf.rb

@@ -22,7 +22,6 @@ do_help if arg_config('--help')
 
 # Make sure to check the ports path for the configured host
 architecture = RbConfig::CONFIG['arch']
-architecture = "x86-mingw32" if architecture == "i386-mingw32"
 
 project_dir = File.expand_path("../../..", __FILE__)
 freetds_ports_dir = File.join(project_dir, 'ports', architecture, 'freetds', FREETDS_VERSION)
@@ -84,7 +83,7 @@ have_dependencies = [
 end
 
 unless have_dependencies
-  abort 'Failed! Do you have FreeTDS 0.95.80 or higher installed?'
+  abort 'Failed! Do you have FreeTDS 1.0.0 or higher installed?'
 end
 
 create_makefile('tiny_tds/tiny_tds')

data/ext/tiny_tds/extconsts.rb

@@ -1,15 +1,9 @@
 
-ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.15"
+ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.17"
 ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
-OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.1s'
+OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '3.4.0'
 OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.1.24"
-FREETDS_VERSION_INFO = Hash.new { |h,k|
-  h[k] = {files: "http://www.freetds.org/files/stable/freetds-#{k}.tar.bz2"}
-}
-FREETDS_VERSION_INFO['1.00'] = {files: 'http://www.freetds.org/files/stable/freetds-1.00.tar.bz2'}
-FREETDS_VERSION_INFO['0.99'] = {files: 'http://www.freetds.org/files/current/freetds-dev.0.99.678.tar.gz'}
-FREETDS_VERSION_INFO['0.95'] = {files: 'http://www.freetds.org/files/stable/freetds-0.95.92.tar.gz'}
-FREETDS_SOURCE_URI = FREETDS_VERSION_INFO[FREETDS_VERSION][:files]
+FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || '1.4.23'
+FREETDS_SOURCE_URI = "http://www.freetds.org/files/stable/freetds-#{FREETDS_VERSION}.tar.bz2"

data/ext/tiny_tds/result.c

@@ -298,42 +298,34 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           }
           break;
         }
-        case 40:   // SYBMSDATE
-        case 41:   // SYBMSTIME
-        case 42:   // SYBMSDATETIME2
-        case 43: { // SYBMSDATETIMEOFFSET
-          #ifdef DBVERSION_73
-            if (dbtds(rwrap->client) >= DBTDS_7_3) {
-              DBDATEREC2 dr2;
-              dbanydatecrack(rwrap->client, &dr2, coltype, data);
-              switch(coltype) {
-                case 40: { // SYBMSDATE
-                  val = rb_funcall(cDate, intern_new, 3, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day));
-                  break;
-                }
-                case 41: { // SYBMSTIME
-                  VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
-                  val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(1900), INT2NUM(1), INT2NUM(1), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
-                  break;
-                }
-                case 42: { // SYBMSDATETIME2
-                  VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
-                  val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
-                  break;
-                }
-                case 43: { // SYBMSDATETIMEOFFSET
-                  long long numerator = ((long)dr2.second * (long long)1000000000) + (long long)dr2.nanosecond;
-                  VALUE rational_sec = rb_Rational(LL2NUM(numerator), opt_onebil);
-                  val = rb_funcall(rb_cTime, intern_new, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), rational_sec, INT2NUM(dr2.tzone*60));
-                  break;
-                }
-              }
-            } else {
-              val = ENCODED_STR_NEW(data, data_len);
+        case SYBMSDATE:
+        case SYBMSTIME:
+        case SYBMSDATETIME2:
+        case SYBMSDATETIMEOFFSET: {
+          DBDATEREC2 dr2;
+          dbanydatecrack(rwrap->client, &dr2, coltype, data);
+          switch(coltype) {
+            case SYBMSDATE: {
+              val = rb_funcall(cDate, intern_new, 3, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day));
+              break;
             }
-          #else
-            val = ENCODED_STR_NEW(data, data_len);
-          #endif
+            case SYBMSTIME: {
+              VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
+              val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(1900), INT2NUM(1), INT2NUM(1), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
+              break;
+            }
+            case SYBMSDATETIME2: {
+              VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
+              val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
+              break;
+            }
+            case SYBMSDATETIMEOFFSET: {
+              long long numerator = ((long)dr2.second * (long long)1000000000) + (long long)dr2.nanosecond;
+              VALUE rational_sec = rb_Rational(LL2NUM(numerator), opt_onebil);
+              val = rb_funcall(rb_cTime, intern_new, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), rational_sec, INT2NUM(dr2.tzone*60));
+              break;
+            }
+          }
           break;
         }
         case SYBCHAR:

data/ext/tiny_tds/tiny_tds_ext.c

@@ -1,6 +1,9 @@
-
 #include <tiny_tds_ext.h>
 
+#ifndef DBVERSION_73
+  #error "DBVERSION_73 is not defined. Aborting compilation."
+#endif
+
 VALUE mTinyTds, cTinyTdsError;
 
 void Init_tiny_tds() {

data/ports/x64-mingw-ucrt/freetds/{1.1.24 → 1.4.23}/bin/osql

@@ -5,7 +5,7 @@
 # then execute isql (assume it's unixODBC's isql).  
 #
 
-USAGE="Syntax: $(basename $0) -S server -U user -P password"
+USAGE="Syntax: $(basename "$0") -S server -U user -P password"
 
 while getopts I:S:U:P: OPTION
 do
@@ -18,68 +18,73 @@ do
 			;;
 		P)	PASSWORD=${OPTARG}
 			;;
-		\?)     echo $USAGE
+		\?)     echo "$USAGE"
 			exit 1
 			;;
 	esac
 done
 
 #cho ${DSN} ${USERNAME} ${PASSWORD}
-if [ -z "${DSN}" -o -z "${USERNAME}" -o -z "${PASSWORD}" ]
+if [ -z "${DSN}" ] || [ -z "${USERNAME}" ] || [ -z "${PASSWORD}" ]
 then 
-	
-	echo $USAGE
+	echo "$USAGE"
 	exit 1
 fi
 
 ISQL=$(command -v isql)
 if [ -z "${ISQL}" ]
 then
-	echo "$(basename $0): error: no \"isql\" command found.  Is unixODBC installed?"
+	echo "$(basename "$0"): error: no \"isql\" command found.  Is unixODBC installed?"
 	exit 1
 fi
 
 # Establish ODBC prefix directory
 
-ISQL_DIR=$(strings ${ISQL} | grep ^/ | grep -v elf | grep -v '\.so\.' | head -1 | sed 's/lib$/etc/' )
+ISQL_DIR=$(strings "${ISQL}" | grep ^/ | grep -v elf | grep -v '\.so\.' | head -1 | sed 's/lib$/etc/' )
 
-INI_DIRNAME="/tmp/$(basename $0).$$"
-exec 3> ${INI_DIRNAME}
+INI_DIRNAME="/tmp/$(basename "$0").$$"
+exec 3> "${INI_DIRNAME}"
 
 # Check the libraries, too. 
 if [ -z "${OVER_DIR}" ]
 then 
+	libcmd='ldd "${ISQL}" | awk "/libodbc\./ {print \$3}"'
+	if ! command -V ldd >/dev/null 2>&1 && command -V otool >/dev/null 2>&1
+	then
+		libcmd='otool -L "${ISQL}" | awk "/libodbc\./ {print \$1}"'
+	fi
 	echo "checking shared odbc libraries linked to isql for default directories..."
-	(echo ${ISQL_DIR}; ldd "${ISQL}" | awk '/libodbc\./ {print $3}') \
+	(echo ${ISQL_DIR}; eval "$libcmd") \
 	| while read L
 	  do 
-	  	strings "$L" | grep '^/' | grep -v '/lib' \
+		strings "$L" | grep '^/' | grep -v '/lib' \
 		| while read D 
 		  do 
-		  	if [ ! -s "${INI_DIRNAME}" ]
+			if [ ! -s "${INI_DIRNAME}" ]
 			then
-			  	printf "	trying $D ... "
-			  	if [ -d "$D" -a -r "${D}/odbc.ini" ]
+				printf "	trying %s ... " "$D"
+				if [ -d "$D" ] && [ -r "${D}/odbc.ini" ]
 				then
-					printf $D >&3
+					echo "$D" >&3
 					printf "OK"
 				else
 					printf "no"
 				fi
 				printf "\n"
 			fi
-		  done
-	  done
+		done
+	done
 fi
+exec 3>&-
 
-ODBC_DIR=$(cat ${INI_DIRNAME}) && rm ${INI_DIRNAME}
+ODBC_DIR=$(cat "${INI_DIRNAME}") && rm "${INI_DIRNAME}"
 
-if [ -z "${ODBC_DIR}" -a -z "${OVER_DIR}" ]
+if [ -z "${ODBC_DIR}" ] && [ -z "${OVER_DIR}" ]
 then
-	echo "$(basename $0): problem: no potential directory strings in \"$(command -v isql)\""
-	echo "$(basename $0): advice: use \"osql -I DIR\" where DIR unixODBC\'s install prefix e.g. /usr/local"
+	echo "$(basename "$0"): problem: no potential directory strings in \"$(command -v isql)\""
+	echo "$(basename "$0"): advice: use \"osql -I DIR\" where DIR unixODBC\'s install prefix e.g. /usr/local"
 	echo "isql strings are:"
-	strings ${ISQL} | grep ^/ | sed 's/^/+ /'
+	strings "${ISQL}" | grep ^/ | sed 's/^/+ /'
 	#xit 1
 fi
 
@@ -97,7 +102,7 @@ then
 	then
 		ODBC_DIR=${OVER_DIR}
 	else
-		echo "$(basename $0): error: \"${OVER_DIR}\" is not a directory"
+		echo "$(basename "$0"): error: \"${OVER_DIR}\" is not a directory"
 		exit 1
 	fi
 fi
@@ -106,9 +111,9 @@ fi
 echo 'checking odbc.ini files'
 for F in "${HOME}/.odbc.ini" "${ODBC_DIR}/odbc.ini"
 do
-	if [ ! -d "$(dirname $F)" ]
+	if [ ! -d "$(dirname "$F")" ]
 	then
-		echo "warning: $(dirname $F) is not a directory" 
+		echo "warning: $(dirname "$F") is not a directory" 
 		continue
 	fi
 	
@@ -120,7 +125,7 @@ do
 		continue
 	fi
 
-	grep -F "[${DSN}]" $F > /dev/null
+	grep -F "[${DSN}]" "$F" > /dev/null
 
 	if [ $? -eq 0 ]
 	then
@@ -134,14 +139,14 @@ done
 
 if [ -z "${ODBC_INI}" ]
 then
-	echo "$(basename $0): error: unable to locate ${DSN} in any odbc.ini"
+	echo "$(basename "$0"): error: unable to locate ${DSN} in any odbc.ini"
 	exit 1
 fi
 
 # Report finding of server entry
 echo found this section:
 SED_CMD="/^\[${DSN}\]/,/^[[:space:]]*$/ { s/^/	/; p; }"
-sed -ne "${SED_CMD}" ${ODBC_INI}
+sed -ne "${SED_CMD}" "${ODBC_INI}"
 
 #
 # Examine server entry in odbc.ini 
@@ -151,28 +156,28 @@ sed -ne "${SED_CMD}" ${ODBC_INI}
 for D in "${DSN}" 'default' 
 do
 	echo "looking for driver for DSN [$D] in ${ODBC_INI}"
-	grep "$D" ${ODBC_INI} > /dev/null
+	grep "$D" "${ODBC_INI}" > /dev/null
 	if [ $? -eq 0 ]
 	then
 		CMD="/^\[$D\]/,/^[[:space:]]*$/ { s/^/	/; p; }"
-		DRIVER_LINE=$(sed -ne "${CMD}" ${ODBC_INI} \
+		DRIVER_LINE=$(sed -ne "${CMD}" "${ODBC_INI}" \
 				| grep -Ei '^[[:space:]]*driver[[:space:]]*=')
 		if [ -z "${DRIVER_LINE}" ]
 		then
-			echo "  no driver mentioned for [$D] in $(basename ${ODBC_INI})"
+			echo "  no driver mentioned for [$D] in $(basename "${ODBC_INI}")"
 			continue
 		fi
 
 		echo "  found driver line: \"${DRIVER_LINE}\""
-		DRIVER=$(echo ${DRIVER_LINE} \
+		DRIVER=$(echo "${DRIVER_LINE}" \
 		    | awk -F ' *= *' '{print $2}' \
 		    | sed 's/[[:space:]][[:space:]]*//g')
 		if [ "${DRIVER}" ]
 		then
-			echo "  driver \"${DRIVER}\" found for [$D] in $(basename ${ODBC_INI})"
+			echo "  driver \"${DRIVER}\" found for [$D] in $(basename "${ODBC_INI}")"
 			break
 		else
-			echo "  driver line for [$D] incomplete in $(basename ${ODBC_INI})"
+			echo "  driver line for [$D] incomplete in $(basename "${ODBC_INI}")"
 			continue
 		fi
 	fi
@@ -180,13 +185,13 @@ done
 
 if [ -z "${DRIVER}" ]
 then
-	echo "$(basename $0): error: no driver found for [${DSN}] in $(basename ${ODBC_INI})"
+	echo "$(basename "$0"): error: no driver found for [${DSN}] in $(basename "${ODBC_INI}")"
 	exit 1
 fi
 
 # get filename of driver
-echo found driver named \"${DRIVER}\"
-if [ -d "${DRIVER}" -o ! -x "${DRIVER}" ]
+echo "found driver named \"${DRIVER}\""
+if [ -d "${DRIVER}" ] || [ ! -x "${DRIVER}" ]
 then
 	# not a filename, look it up
 	DRIVERNAME=${DRIVER}
@@ -194,39 +199,39 @@ then
 	echo "\"${DRIVERNAME}\" is not an executable file"
 	echo "looking for entry named [${DRIVERNAME}] in ${ODBC_INST}"
 
-	grep "${DRIVERNAME}" ${ODBC_INST} > /dev/null
+	grep "${DRIVERNAME}" "${ODBC_INST}" > /dev/null
 	if [ $? -ne 0 ]
 	then
 		if [ $? -eq 1 ]
 		then
-			echo "$(basename $0): error: no driver entry [${DRIVERNAME}] in ${ODBC_INST}"
+			echo "$(basename "$0"): error: no driver entry [${DRIVERNAME}] in ${ODBC_INST}"
 		fi
 		exit 1;
 	fi
 	
 	CMD="/^\[${DRIVERNAME}\]/,/^[[:space:]]*$/ { s/^/	/; p; }"
-	DRIVER_LINE=$(sed -ne "${CMD}" ${ODBC_INST} \
+	DRIVER_LINE=$(sed -ne "${CMD}" "${ODBC_INST}" \
 				| grep -Ei '^[[:space:]]*driver[[:space:]]*=')
 	if [ -z "${DRIVER_LINE}" ]
 	then
-		echo "$(basename $0): no driver mentioned for [${DRIVERNAME}] in $(basename ${ODBC_INST})"
+		echo "$(basename "$0"): no driver mentioned for [${DRIVERNAME}] in $(basename "${ODBC_INST}")"
 		exit 1
 	fi
 
 	echo "  found driver line: \"${DRIVER_LINE}\""
-	DRIVER=$(echo ${DRIVER_LINE} | awk -F ' *= *' '{print $2}')
+	DRIVER=$(echo "${DRIVER_LINE}" | awk -F ' *= *' '{print $2}')
 	if [ -z "${DRIVER}" ]
 	then
-		echo "$(basename $0): driver line incomplete for [${DRIVERNAME}] in $(basename ${ODBC_INST})"
+		echo "$(basename "$0"): driver line incomplete for [${DRIVERNAME}] in $(basename "${ODBC_INST}")"
 		exit 1
 	fi
 
-	echo "  found driver ${DRIVER} for [${DRIVERNAME}] in $(basename ${ODBC_INST})"
+	echo "  found driver ${DRIVER} for [${DRIVERNAME}] in $(basename "${ODBC_INST}")"
 fi
 
 if [ -z "${DRIVER}" ]
 then
-	echo $(basename $0): 'error: sorry, failed sanity check: ${DRIVER} is null' 
+	echo "$(basename "$0"): error: sorry, failed sanity check: \${DRIVER} is null"
 	exit 1
 fi
 
@@ -235,30 +240,30 @@ then
 	echo "${DRIVER} is an executable file"
 else
 	echo "${DRIVER} is not an executable file"
-	echo "$(basename $0): error: no driver found for ${DSN}"
+	echo "$(basename "$0"): error: no driver found for ${DSN}"
 	exit 1
 fi
 
 # find the server/servername
-SERVER_LINE=$(sed -ne "${SED_CMD}" ${ODBC_INI} \
+SERVER_LINE=$(sed -ne "${SED_CMD}" "${ODBC_INI}" \
 		| grep -Ei '^[[:space:]]*server(name)*[[:space:]]*=')
 
-ATTRIBUTE=$(echo ${SERVER_LINE} | awk -F' *= *' '{print $1}')
+ATTRIBUTE=$(echo "${SERVER_LINE}" | awk -F' *= *' '{print $1}')
 
 if [ -z "${ATTRIBUTE}" ]
 then
-	echo "$(basename $0): neither \"Server\" nor \"Servername\" found for [${DSN}] in $(basename ${ODBC_INI})"
+	echo "$(basename "$0"): neither \"Server\" nor \"Servername\" found for [${DSN}] in $(basename "${ODBC_INI}")"
 	exit 1
 fi
 
-echo ${SERVER_LINE} | grep -i servername >/dev/null
+echo "${SERVER_LINE}" | grep -i servername >/dev/null
 
 #
 # Find the server's hostname 
 #
 if [ $? -eq 0 ] # ODBC-Combined
 then
-	TDS_SERVER=$(echo ${SERVER_LINE} | awk -F ' *= *' '{print $2}')
+	TDS_SERVER=$(echo "${SERVER_LINE}" | awk -F ' *= *' '{print $2}')
 	echo 'Using ODBC-Combined strategy'
 	echo "DSN [${DSN}] has servername \"${TDS_SERVER}\" (from ${ODBC_INI})"
 	if [ -z "${TDS_SERVER}" ]
@@ -271,7 +276,7 @@ then
 	FREETDS_DIR=$(tsql -C | grep 'freetds.conf directory' | awk -F: '{print $2}' | sed 's/^ *//')
 	if [ -z "${FREETDS_DIR}" ]
 	then
-		echo "$(basename $0): error: unable to locate directory for freetds.conf using \"$(command -v tsql)\""
+		echo "$(basename "$0"): error: unable to locate directory for freetds.conf using \"$(command -v tsql)\""
 		exit 1
 	fi
 	
@@ -279,27 +284,27 @@ then
 	do
 		if [ -r "$F" ]
 		then
-			echo $F is a readable file
+			echo "$F is a readable file"
 		else
-			echo cannot read \"$F\"
+			echo "cannot read \"$F\""
 			continue
 		fi
 
 		echo "looking for [${TDS_SERVER}] in $F"
-		grep -F "[${TDS_SERVER}]" $F > /dev/null
+		grep -F "[${TDS_SERVER}]" "$F" > /dev/null
 
 		if [ $? -eq 0 ]
 		then
 			FREETDS_CONF=$F
 			break
 		else
-			echo "[${TDS_SERVER}]" not found in $F
+			echo "[${TDS_SERVER}] not found in $F"
 		fi
 	done
 	
 	if [ -z "${FREETDS_CONF}" ]
 	then
-		echo "$(basename $0): error: unable to locate ${TDS_SERVER} in any freetds.conf"
+		echo "$(basename "$0"): error: unable to locate ${TDS_SERVER} in any freetds.conf"
 		exit 1
 	fi
 
@@ -307,29 +312,29 @@ then
 
 	echo found this section:
 	SED_CMD="/^\[${TDS_SERVER}\]/,/^[[:space:]]*$/ { s/^/	/; p; }"
-	sed -ne "${SED_CMD}" ${FREETDS_CONF}
+	sed -ne "${SED_CMD}" "${FREETDS_CONF}"
 
-	SERVER_LINE=$(sed -ne "${SED_CMD}" ${FREETDS_CONF} \
+	SERVER_LINE=$(sed -ne "${SED_CMD}" "${FREETDS_CONF}" \
 			| grep -Ei '^[[:space:]]*host[[:space:]]*=')
 
 	# No character class support in mawk, 
 	# cf. "Mawk does not support Posix character classes in expressions"
 	# https://bugs.launchpad.net/ubuntu/+source/mawk/+bug/69724
-	HOST=$(echo ${SERVER_LINE} | awk -F' *= *' '{print $2}')
+	HOST=$(echo "${SERVER_LINE}" | awk -F' *= *' '{print $2}')
 
 	if [ -z "${HOST}" ]
 	then
-		echo "$(basename $0): no \"host\" entry found for [${TDS_SERVER}] in $(basename ${FREETDS_CONF})"
+		echo "$(basename "$0"): no \"host\" entry found for [${TDS_SERVER}] in $(basename "${FREETDS_CONF}")"
 		exit 1
 	fi
 	
 else # odbc.ini contains a "server", a DNS host
-	HOST=$(echo ${SERVER_LINE} | awk -F ' *= *' '{print $2}')
+	HOST=$(echo "${SERVER_LINE}" | awk -F ' *= *' '{print $2}')
 	echo "\"${ATTRIBUTE}\" found, not using freetds.conf"
 	echo "${ATTRIBUTE} is \"${HOST}\""
 	if [ -z "${HOST}" ]
 	then
-		echo "$(basename $0): no value found for \"${ATTRIBUTE}\" entry in $(basename ${ODBC_INI})"
+		echo "$(basename "$0"): no value found for \"${ATTRIBUTE}\" entry in $(basename "${ODBC_INI}")"
 		exit 1
 	fi
 fi
@@ -337,14 +342,14 @@ fi
 # If the "host" is an ip address, look up the name, for neatness, e.g. 
 ## $ host 10.81.36.39
 ## 39.36.81.10.IN-ADDR.ARPA domain name pointer ntc5003.eg.com
-if [ "${HOST}" = "$(echo ${HOST} | sed 's/[^.0-9]*//')" ]
+if [ "${HOST}" = "$(echo "${HOST}" | sed 's/[^.0-9]*//')" ]
 then 
 	ADDRESS=${HOST}
-	echo 'looking up hostname for ip address' ${ADDRESS}
-	HOST=$(host ${HOST} | awk '/domain/ {print $5}' | sed 's/\.$//')
+	echo "looking up hostname for ip address ${ADDRESS}"
+	HOST=$(host "${HOST}" | awk '/domain/ {print $5}' | sed 's/\.$//')
 	if [ -z "${HOST}" ]
 	then
-		echo "$(basename $0): warning: no DNS hostname found for \"${ADDRESS}\""
+		echo "$(basename "$0"): warning: no DNS hostname found for \"${ADDRESS}\""
 		HOST=${ADDRESS}	# restore host address string
 	fi
 fi
@@ -352,11 +357,11 @@ fi
 # Now we have a DNS hostname for the server in HOST
 if [ "${HOST}" != "${ADDRESS}" ]
 then
-    ADDRESS=$(host ${HOST} | awk '/has address/ {print $4}' | head -1)
+    ADDRESS=$(host "${HOST}" | awk '/has address/ {print $4}' | head -1)
 fi
 if [ -z "${ADDRESS}" ]
 then
-	echo "$(basename $0): no IP address found for \"${HOST}\""
+	echo "$(basename "$0"): no IP address found for \"${HOST}\""
 	exit 1
 fi
 
@@ -366,23 +371,23 @@ fi
 
 printf "\n"
 printf "Configuration looks OK.  Connection details:\n\n"
-printf "%22s:\t%-30s\n"  DSN ${DSN}
+printf "%22s:\t%-30s\n"  DSN "${DSN}"
 printf "%22s:\t%-30s\n"  odbc.ini "${ODBC_INI}"
-printf "%22s:\t%-30s\n"  Driver ${DRIVER}
-printf "%22s:\t%-30s\n" "Server hostname" ${HOST}
-printf "%22s:\t%-30s\n"  Address ${ADDRESS}
+printf "%22s:\t%-30s\n"  Driver "${DRIVER}"
+printf "%22s:\t%-30s\n" "Server hostname" "${HOST}"
+printf "%22s:\t%-30s\n"  Address "${ADDRESS}"
 printf "\n"
 
-echo Attempting connection as ${USERNAME} ... 
+echo "Attempting connection as ${USERNAME} ..."
 
 if [ -z "${TDSDUMP}" ]
-then 
-	TDSDUMP_AUTO="/tmp/$(basename $0).dump.$$"
+then
+	TDSDUMP_AUTO="/tmp/$(basename "$0").dump.$$"
 	export TDSDUMP=${TDSDUMP_AUTO}
 fi
 
-( set -x; isql ${DSN} ${USERNAME} ${PASSWORD} -v ) \
-	|| sed -ne 's/Connecting/FAILED &/p' ${TDSDUMP}
+( set -x; isql "${DSN}" "${USERNAME}" "${PASSWORD}" -v ) \
+	|| sed -ne 's/Connecting/FAILED &/p' "${TDSDUMP}"
 
-test "${TDSDUMP_AUTO}" && rm -f ${TDSDUMP_AUTO}
+test "${TDSDUMP_AUTO}" && rm -f "${TDSDUMP_AUTO}"