From f4de0cef26353552608042e98a54d74a0d1ecb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= Date: Thu, 22 Feb 2024 17:25:56 +0100 Subject: [PATCH] Add alternative types that should fix dialyzer on r26 --- src/ejabberd_sql.erl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/ejabberd_sql.erl b/src/ejabberd_sql.erl index 7d2766459..58580c182 100644 --- a/src/ejabberd_sql.erl +++ b/src/ejabberd_sql.erl @@ -67,12 +67,22 @@ -export([connecting/2, connecting/3, session_established/2, session_established/3]). +-ifdef(OTP_RELEASE). + -if(?OTP_RELEASE >= 27). + -type(odbc_connection_reference() :: odbc:connection_reference()). + -else. + -type(odbc_connection_reference() :: pid()). + -endif. +-else. + -type(odbc_connection_reference() :: pid()). +-endif. + -include("logger.hrl"). -include("ejabberd_sql_pt.hrl"). -include("ejabberd_stacktrace.hrl"). -record(state, - {db_ref :: undefined | pid() | odbc:connection_reference(), + {db_ref :: undefined | pid() | odbc_connection_reference(), db_type = odbc :: pgsql | mysql | sqlite | odbc | mssql, db_version :: undefined | non_neg_integer() | {non_neg_integer(), atom(), non_neg_integer()}, reconnect_count = 0 :: non_neg_integer(),