fix build errors on macos

Author: TimelordUK

.github/workflows/prebuild.yml

@@ -89,7 +89,7 @@ jobs:
     name: Prebuild Electron ${{ matrix.electron }} on ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-latest]
+        os: [ubuntu-latest, windows-2022, macos-latest]
         electron: [32, 33, 34, 35, 36]
     runs-on: ${{ matrix.os }}
 

cpp/include/utils/Logger.h

@@ -215,6 +215,17 @@ class Logger {
     }                                                                       \
   } while (0)
 
+#ifdef __APPLE__
+// macOS doesn't support std::ctype<char16_t>, so convert to regular string
+#define SQL_LOG_INFO_U16STREAM(expr)                                     \
+  do {                                                                   \
+    if (mssql::Logger::GetInstance().IsEnabled(mssql::LogLevel::Info)) { \
+      std::ostringstream oss;                                             \
+      oss << expr;                                                        \
+      mssql::Logger::GetInstance().Info(oss.str());                       \
+    }                                                                    \
+  } while (0)
+#else
 #define SQL_LOG_INFO_U16STREAM(expr)                                     \
   do {                                                                   \
     if (mssql::Logger::GetInstance().IsEnabled(mssql::LogLevel::Info)) { \
@@ -223,7 +234,18 @@ class Logger {
       mssql::Logger::GetInstance().Info(u16oss.str());                   \
     }                                                                    \
   } while (0)
+#endif
 
+#ifdef __APPLE__
+#define SQL_LOG_DEBUG_U16STREAM(expr)                                     \
+  do {                                                                    \
+    if (mssql::Logger::GetInstance().IsEnabled(mssql::LogLevel::Debug)) { \
+      std::ostringstream oss;                                             \
+      oss << expr;                                                        \
+      mssql::Logger::GetInstance().Debug(oss.str());                      \
+    }                                                                     \
+  } while (0)
+#else
 #define SQL_LOG_DEBUG_U16STREAM(expr)                                     \
   do {                                                                    \
     if (mssql::Logger::GetInstance().IsEnabled(mssql::LogLevel::Debug)) { \
@@ -232,7 +254,18 @@ class Logger {
       mssql::Logger::GetInstance().Debug(u16oss.str());                   \
     }                                                                     \
   } while (0)
+#endif
 
+#ifdef __APPLE__
+#define SQL_LOG_TRACE_U16STREAM(expr)                                     \
+  do {                                                                    \
+    if (mssql::Logger::GetInstance().IsEnabled(mssql::LogLevel::Trace)) { \
+      std::ostringstream oss;                                             \
+      oss << expr;                                                        \
+      mssql::Logger::GetInstance().Trace(oss.str());                      \
+    }                                                                     \
+  } while (0)
+#else
 #define SQL_LOG_TRACE_U16STREAM(expr)                                     \
   do {                                                                    \
     if (mssql::Logger::GetInstance().IsEnabled(mssql::LogLevel::Trace)) { \
@@ -241,6 +274,7 @@ class Logger {
       mssql::Logger::GetInstance().Trace(u16oss.str());                   \
     }                                                                     \
   } while (0)
+#endif
 
 // Function entry/exit logging helpers
 #define SQL_LOG_FUNC_ENTRY()                                              \

cpp/src/js/workers/open_worker.cpp

@@ -2,6 +2,7 @@
 
 #include <utils/Logger.h>
 #include <common/odbc_common.h>
+#include <common/string_utils.h>
 #include <js/Connection.h>
 #include <js/js_object_mapper.h>
 #include <odbc/odbc_connection.h>
@@ -17,12 +18,20 @@ OpenWorker::OpenWorker(Napi::Function& callback,
       parent_(parent),
       connectionString_(connectionString),
       connectionId_(-1) {
+#ifdef __APPLE__
+  SQL_LOG_DEBUG_U16STREAM("OpenWorker constructor for connection: " << StringUtils::U16StringToUtf8(connectionString_));
+#else
   SQL_LOG_DEBUG_U16STREAM("OpenWorker constructor for connection: " << connectionString_);
+#endif
 }
 
 void OpenWorker::Execute() {
   try {
+#ifdef __APPLE__
+    SQL_LOG_DEBUG_U16STREAM("Executing OpenWorker for connection: " << StringUtils::U16StringToUtf8(connectionString_));
+#else
     SQL_LOG_DEBUG_U16STREAM("Executing OpenWorker for connection: " << connectionString_);
+#endif
 
     if (!connection_->Open(connectionString_, 0)) {
       SetError("Failed to open connection");