Merge branch 'main' into fix/dropdown-chevron-first-open

Author: datlechin

CHANGELOG.md

@@ -10,6 +10,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Confirmation dialogs for deep link queries, connection imports, and pre-connect scripts
+- JSON fields in Row Details sidebar now display in a scrollable monospaced text area
+
+### Fixed
+
+- MariaDB JSON columns misdetected as BLOB, showing hex dumps instead of JSON text
+
+### Fixed
+
+- MongoDB Atlas connections failing with "TLS certificate verify failed" due to missing CA bundle
 
 ### Fixed
 

Libs/checksums.sha256

@@ -1,7 +1,7 @@
-064606d4c05f60a73b7bed9574f703d56effde6006a0ada4a660e00e0949bbeb  Libs/libbson_arm64.a
-0f05902d61adec1359c94f12c9bc7a1ceac86f4b492e2d6c02411a5926a0d728  Libs/libbson_universal.a
-2b21d294ed199e46949dfb29d229399d5345c256c39ed07b94a974890fcf5110  Libs/libbson_x86_64.a
-0f05902d61adec1359c94f12c9bc7a1ceac86f4b492e2d6c02411a5926a0d728  Libs/libbson.a
+36e3a521b8da03bafd0f943c4f3b21c8c573bf9d640c6c9e764c0c3632672849  Libs/libbson_arm64.a
+b7716e3f295a54feee85c8771332505be2f9a4a430a088d476d60e358d737c9e  Libs/libbson_universal.a
+1e502e7fb4edc79639140e18d433a1ed1be2931162daecee71a74d09e9f4c550  Libs/libbson_x86_64.a
+b7716e3f295a54feee85c8771332505be2f9a4a430a088d476d60e358d737c9e  Libs/libbson.a
 8d7e31145470a339f4f57930831936db30412393a339598deece6f650214865a  Libs/libcassandra_arm64.a
 9bfd7d7cb4a7ee9823b4c5141e942a8534de63395983388722dc7c98e5d7731e  Libs/libcassandra_universal.a
 7f1d058c77b66273db2b3867103c19f62ed0518fb38611b178ce04029213d5d8  Libs/libcassandra_x86_64.a
@@ -26,10 +26,10 @@ b777f7a42766fb08c8e67b2310c67d2d463d77d3554c6092221c3352778622b2  Libs/libmariad
 5326ed729b287ae5dbbcf073aaa70dce29a73c7431e446d5958271af19dac8d8  Libs/libmariadb_universal.a
 4f7bbb3d73be178d4211c3bd5b2726b4a12db8b808eaa5212bf8e9eb3c570814  Libs/libmariadb_x86_64.a
 5326ed729b287ae5dbbcf073aaa70dce29a73c7431e446d5958271af19dac8d8  Libs/libmariadb.a
-8e587e9ed0b4291345f16a647bc7ed2dc30edbee87b9887eef94098d574aac13  Libs/libmongoc_arm64.a
-553b6636a37886dd44732dddcb97f6e8192dc1b3fbb914042c8da8a9685ce163  Libs/libmongoc_universal.a
-ce569e738c0f62f13906095bc33e10f20d62cd32535db89bc6af6231e86c1632  Libs/libmongoc_x86_64.a
-553b6636a37886dd44732dddcb97f6e8192dc1b3fbb914042c8da8a9685ce163  Libs/libmongoc.a
+9f4c87916ef65eae43b19d7568dc4fd4dffd884dc0cae15913b90965293339a7  Libs/libmongoc_arm64.a
+0d7ddc82dc7327a4b5187ffbc68a1419b5e5ff7b2be7b927e16793eef4d34303  Libs/libmongoc_universal.a
+635705c7dc8d689efdee5ec1bd8a8cbd0d09ae20db0869480271a293d492de50  Libs/libmongoc_x86_64.a
+0d7ddc82dc7327a4b5187ffbc68a1419b5e5ff7b2be7b927e16793eef4d34303  Libs/libmongoc.a
 5dbf2cb5ef37d8adbf607db82461b36a3fd7037c11d891383e6e918378a33d78  Libs/libpgcommon_arm64.a
 3ca491a723b9d9dfc13b815659b44a82253b540dd6b115f03ac68c5154ec26db  Libs/libpgcommon_universal.a
 4bfad7376aefa866d1ed0b7e54966ec6c9d70dcfed928e1311c20321bf08881c  Libs/libpgcommon_x86_64.a

Plugins/MongoDBDriverPlugin/CLibMongoc/include/mongoc/mongoc-config.h

@@ -78,7 +78,7 @@
  * MONGOC_ENABLE_SSL_SECURE_TRANSPORT is set from configure to determine if we are
  * compiled with Native SSL support on Darwin
  */
-#define MONGOC_ENABLE_SSL_SECURE_TRANSPORT 0
+#define MONGOC_ENABLE_SSL_SECURE_TRANSPORT 1
 
 #if MONGOC_ENABLE_SSL_SECURE_TRANSPORT != 1
 #  undef MONGOC_ENABLE_SSL_SECURE_TRANSPORT
@@ -89,7 +89,7 @@
  * MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO is set from configure to determine if we are
  * compiled with Native Crypto support on Darwin
  */
-#define MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO 0
+#define MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO 1
 
 #if MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO != 1
 #  undef MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO
@@ -111,7 +111,7 @@
  * MONGOC_ENABLE_SSL_OPENSSL is set from configure to determine if we are
  * compiled with OpenSSL support.
  */
-#define MONGOC_ENABLE_SSL_OPENSSL 1
+#define MONGOC_ENABLE_SSL_OPENSSL 0
 
 #if MONGOC_ENABLE_SSL_OPENSSL != 1
 #  undef MONGOC_ENABLE_SSL_OPENSSL
@@ -122,7 +122,7 @@
  * MONGOC_ENABLE_CRYPTO_LIBCRYPTO is set from configure to determine if we are
  * compiled with OpenSSL support.
  */
-#define MONGOC_ENABLE_CRYPTO_LIBCRYPTO 1
+#define MONGOC_ENABLE_CRYPTO_LIBCRYPTO 0
 
 #if MONGOC_ENABLE_CRYPTO_LIBCRYPTO != 1
 #  undef MONGOC_ENABLE_CRYPTO_LIBCRYPTO
@@ -164,7 +164,7 @@
 /*
  * Use ASN1_STRING_get0_data () rather than the deprecated ASN1_STRING_data
  */
-#define MONGOC_HAVE_ASN1_STRING_GET0_DATA 1
+#define MONGOC_HAVE_ASN1_STRING_GET0_DATA 0
 
 #if MONGOC_HAVE_ASN1_STRING_GET0_DATA != 1
 #  undef MONGOC_HAVE_ASN1_STRING_GET0_DATA
@@ -338,7 +338,7 @@
  * Set if we have zstd compression support
  *
  */
-#define MONGOC_ENABLE_COMPRESSION_ZSTD 1
+#define MONGOC_ENABLE_COMPRESSION_ZSTD 0
 
 #if MONGOC_ENABLE_COMPRESSION_ZSTD != 1
 #  undef MONGOC_ENABLE_COMPRESSION_ZSTD

Plugins/MySQLDriverPlugin/MariaDBPluginConnection.swift

@@ -11,10 +11,11 @@ import Foundation
 import OSLog
 import TableProPluginKit
 
-// MySQL/MariaDB field flag constants
-private let mysqlBinaryFlag: UInt = 0x0080   // 128
-private let mysqlEnumFlag: UInt = 0x0100     // 256
-private let mysqlSetFlag: UInt = 0x0800      // 2048
+// MySQL/MariaDB field flag and charset constants
+private let mysqlBinaryFlag: UInt = 0x0080
+private let mysqlEnumFlag: UInt = 0x0100
+private let mysqlSetFlag: UInt = 0x0800
+private let mysqlBinaryCharset: UInt32 = 63
 
 private let logger = Logger(subsystem: "com.TablePro", category: "MariaDBPluginConnection")
 
@@ -72,13 +73,27 @@ struct MySQLSSLConfig {
 
 // MARK: - Type Mapping
 
-func mysqlTypeToString(_ type: UInt32, length: UInt, flags: UInt) -> String {
+func mysqlTypeToString(_ fieldPtr: UnsafePointer<MYSQL_FIELD>) -> String {
+    let field = fieldPtr.pointee
+    let flags = UInt(field.flags)
+    let length = field.length
+
+    // MariaDB extended metadata: detect JSON stored as LONGTEXT (best-effort)
+    var attr = MARIADB_CONST_STRING()
+    if mariadb_field_attr(&attr, fieldPtr, MARIADB_FIELD_ATTR_FORMAT_NAME) == 0,
+       let str = attr.str, attr.length > 0,
+       String(cString: str) == "json" {
+        return "JSON"
+    }
+
     if (flags & mysqlEnumFlag) != 0 { return "ENUM" }
     if (flags & mysqlSetFlag) != 0 { return "SET" }
 
-    let isBinary = (flags & mysqlBinaryFlag) != 0
+    // Binary flag alone is insufficient — MariaDB sets it on text columns with
+    // binary collation (e.g. utf8mb4_bin for JSON). Only charset 63 is truly binary.
+    let isBinary = (flags & mysqlBinaryFlag) != 0 && field.charsetnr == mysqlBinaryCharset
 
-    switch type {
+    switch field.type.rawValue {
     case 0: return "DECIMAL"
     case 1: return "TINYINT"
     case 2: return "SMALLINT"
@@ -444,7 +459,7 @@ final class MariaDBPluginConnection: @unchecked Sendable {
                 if (fieldFlags & mysqlEnumFlag) != 0 { fieldType = 247 }
                 if (fieldFlags & mysqlSetFlag) != 0 { fieldType = 248 }
                 columnTypes.append(fieldType)
-                columnTypeNames.append(mysqlTypeToString(fieldType, length: field.length, flags: fieldFlags))
+                columnTypeNames.append(mysqlTypeToString(fields + i))
             }
         }
 
@@ -749,7 +764,7 @@ final class MariaDBPluginConnection: @unchecked Sendable {
                 if (fieldFlags & mysqlEnumFlag) != 0 { fieldType = 247 }
                 if (fieldFlags & mysqlSetFlag) != 0 { fieldType = 248 }
                 columnTypes.append(fieldType)
-                columnTypeNames.append(mysqlTypeToString(fieldType, length: field.length, flags: fieldFlags))
+                columnTypeNames.append(mysqlTypeToString(fields + i))
             }
         }
 

TablePro.xcodeproj/project.pbxproj

@@ -2477,8 +2477,10 @@
 					"$(PROJECT_DIR)/Libs/libmongoc.a",
 					"-force_load",
 					"$(PROJECT_DIR)/Libs/libbson.a",
-					"-lssl",
-					"-lcrypto",
+					"-framework",
+					Security,
+					"-framework",
+					CoreFoundation,
 					"-lresolv",
 					"-lz",
 				);
@@ -2517,8 +2519,10 @@
 					"$(PROJECT_DIR)/Libs/libmongoc.a",
 					"-force_load",
 					"$(PROJECT_DIR)/Libs/libbson.a",
-					"-lssl",
-					"-lcrypto",
+					"-framework",
+					Security,
+					"-framework",
+					CoreFoundation,
 					"-lresolv",
 					"-lz",
 				);

TablePro/Core/Plugins/PluginManager.swift

@@ -1004,6 +1004,7 @@ final class PluginManager {
         replaceExistingPlugin(bundleId: newBundleId)
 
         let fm = FileManager.default
+        try fm.createDirectory(at: userPluginsDir, withIntermediateDirectories: true)
         let destURL = userPluginsDir.appendingPathComponent(url.lastPathComponent)
 
         if url.standardizedFileURL != destURL.standardizedFileURL {
@@ -1075,6 +1076,7 @@ final class PluginManager {
 
             replaceExistingPlugin(bundleId: newBundleId)
 
+            try fm.createDirectory(at: userPluginsDir, withIntermediateDirectories: true)
             let destURL = userPluginsDir.appendingPathComponent(extracted.lastPathComponent)
 
             if fm.fileExists(atPath: destURL.path) {

TablePro/Views/RightSidebar/EditableFieldView.swift

@@ -375,6 +375,14 @@ struct ReadOnlyFieldView: View {
                             .frame(maxWidth: .infinity, alignment: .topLeading)
                     }
                     .frame(maxHeight: 120)
+                } else if columnTypeEnum.isJsonType {
+                    ScrollView {
+                        Text(value)
+                            .font(.system(size: ThemeEngine.shared.activeTheme.typography.small, design: .monospaced))
+                            .textSelection(.enabled)
+                            .frame(maxWidth: .infinity, alignment: .topLeading)
+                    }
+                    .frame(maxHeight: 200)
                 } else if isLongText {
                     Text(value)
                         .font(.system(size: ThemeEngine.shared.activeTheme.typography.small, design: .monospaced))