Set the driver argument for getDSN to null by default (#798)

* Added the driver argument to getDSN

* Dropped the driver argument but set to null as default

* Removed the AE condition in locale support

* Modified the AE condition for locale support

test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc

@@ -72,7 +72,7 @@ function connect($keywords = '', $options=array(), $errmode = PDO::ERRMODE_EXCEP
  * @param  bool  $disableCE : flag for disabling column encryption even when keystore is NOT none
  * @return string dsn string used for PDO constructor
  */
-function getDSN($sqlsrvserver, $database, $driver, $keywords = '', $disableCE = false)
+function getDSN($sqlsrvserver, $database, $driver = null, $keywords = '', $disableCE = false)
 {
     require("MsSetup.inc");
     $dsn = "";
@@ -85,7 +85,7 @@ function getDSN($sqlsrvserver, $database, $driver, $keywords = '', $disableCE =
     if ($database) {
         $dsn .= "database=$database;";
     }
-    if ($driver) {
+    if (!is_null($driver)) {
         $dsn .= "driver=$driver;";
     }
     if ($keystore != "none" && !$disableCE) {

test/functional/sqlsrv/MsCommon.inc

@@ -472,7 +472,7 @@ function isLocaleSupported()
     if (isWindows()) {
         return true;
     }
-    if (AE\isColEncrypted()) {
+    if (AE\isDataEncrypted()) {
         return false;
     }
     // now check ODBC version