fix: resolve Git merge conflicts in oceanbase.clj driver file

Author: xxsc0529

metabase-oceanbase-plugin/modules/drivers/oceanbase/src/metabase/driver/oceanbase.clj

@@ -212,24 +212,16 @@
   [_]
   (->>
    [driver.common/default-host-details
-<<<<<<< HEAD
-    (assoc driver.common/default-port-details :placeholder 2881)
-=======
     (assoc driver.common/default-port-details
            :placeholder 2881
            :helper-text "Port number (default: 2881)")
->>>>>>> origin/master
     driver.common/default-dbname-details
     driver.common/default-user-details
     driver.common/default-password-details
     driver.common/default-role-details
     driver.common/advanced-options-start
     (assoc driver.common/additional-options
-<<<<<<< HEAD
-           :placeholder  "useUnicode=true&characterEncoding=UTF-8&autoReconnect=true")
-=======
            :placeholder "useUnicode=true&characterEncoding=UTF-8&autoReconnect=true")
->>>>>>> origin/master
     driver.common/default-advanced-options]
    (into [] (mapcat u/one-or-many))))
 
@@ -346,22 +338,6 @@
 
 (defmethod driver/humanize-connection-error-message :oceanbase
   [_ message]
-<<<<<<< HEAD
-  (condp re-matches message
-    #"^Communications link failure\s+The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.$"
-    :cannot-connect-check-host-and-port
-
-    #"^Unknown database .*$"
-    :database-name-incorrect
-
-    #"Access denied for user.*$"
-    :username-or-password-incorrect
-
-    #"Must specify port after ':' in connection string"
-    :invalid-hostname
-
-    message))
-=======
   (let [message-str (str message)]
     (cond
       (re-matches #"^Communications link failure\s+The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.$" message-str)
@@ -377,7 +353,6 @@
       :invalid-hostname
 
       :else message)))
->>>>>>> origin/master
 
 (defmethod sql-jdbc.sync/excluded-schemas :oceanbase
   [_]
@@ -671,14 +646,6 @@
        (log/info "OceanBase describe-table for table:" table-name "schema:" schema)
        (let [result (assoc (select-keys table [:name :schema])
                            :fields (try
-<<<<<<< HEAD
-                                     (let [fields (into #{} (sql-jdbc.sync/describe-fields driver database
-                                                                                          :table-names [table-name]
-                                                                                          :schema-names (when schema [schema])))]
-                                       (log/info "OceanBase describe-fields returned" (count fields) "fields for table" table-name)
-                                       (log/debug "OceanBase describe-fields result:" fields)
-                                       fields)
-=======
                                      ;; First, try to detect the mode for this specific connection
                                      (let [mode (detect-mode-from-connection conn)
                                            _ (log/info "OceanBase detected mode for table" table-name ":" mode)]
@@ -722,7 +689,6 @@
                                            (log/info "OceanBase Oracle describe-fields returned" (count fields) "fields for table" table-name)
                                            (log/debug "OceanBase Oracle describe-fields result:" fields)
                                            fields)))
->>>>>>> origin/master
                                      (catch Throwable e
                                        (log/error e "Error retrieving fields for OceanBase table" schema "." table-name)
                                        (try