From 198a219496ba18f46aca82ae4a4104af6f143e5e Mon Sep 17 00:00:00 2001 From: Yuriy Kubekin Date: Mon, 13 Feb 2023 13:23:39 +0300 Subject: [PATCH] v2023.1.7 --- .../stimulsoft/js/JSDataAdapterServlet.java | 4 ++-- .../stimulsoft/js/adapter/JSDataAdapter.java | 8 +++---- NetCoreDataAdapters/DataAdaptersController.cs | 6 ++--- NetCoreDataAdapters/SQLAdapter.cs | 6 ++--- NetDataAdapters/Handler.ashx.cs | 6 ++--- NetDataAdapters/SQLAdapter.cs | 6 ++--- NodejsDataAdapters/FirebirdAdapter.js | 6 ++--- NodejsDataAdapters/MSSQLAdapter.js | 6 ++--- NodejsDataAdapters/MySQLAdapter.js | 6 ++--- NodejsDataAdapters/PostgreSQLAdapter.js | 6 ++--- NodejsDataAdapters/index.js | 6 ++--- NodejsDataAdapters/package.json | 2 +- PHPDataAdapters/StiDataAdapter.php | 6 ++--- PHPDataAdapters/StiFirebirdAdapter.php | 6 ++--- PHPDataAdapters/StiMsSqlAdapter.php | 6 ++--- PHPDataAdapters/StiMySqlAdapter.php | 6 ++--- PHPDataAdapters/StiOdbcAdapter.php | 6 ++--- PHPDataAdapters/StiOracleAdapter.php | 6 ++--- PHPDataAdapters/StiPostgreSqlAdapter.php | 6 ++--- PHPDataAdapters/classes/StiConnectionInfo.php | 24 +++++++++---------- PHPDataAdapters/classes/StiDataHandler.php | 12 +++++----- PHPDataAdapters/classes/StiDataRequest.php | 6 ++--- PHPDataAdapters/classes/StiDataResult.php | 5 ++-- PHPDataAdapters/classes/StiResponse.php | 4 ++-- PHPDataAdapters/classes/StiResult.php | 6 +++-- PHPDataAdapters/enums/StiDataCommand.php | 4 ++-- PHPDataAdapters/enums/StiDatabaseType.php | 4 ++-- PHPDataAdapters/handler.php | 4 ++-- 28 files changed, 91 insertions(+), 88 deletions(-) diff --git a/JavaDataAdapters/src/com/stimulsoft/js/JSDataAdapterServlet.java b/JavaDataAdapters/src/com/stimulsoft/js/JSDataAdapterServlet.java index d288a05..93beda0 100644 --- a/JavaDataAdapters/src/com/stimulsoft/js/JSDataAdapterServlet.java +++ b/JavaDataAdapters/src/com/stimulsoft/js/JSDataAdapterServlet.java @@ -1,7 +1,7 @@ /* Stimulsoft.Reports.JS -Version: 2023.1.6 -Build date: 2023.01.25 +Version: 2023.1.7 +Build date: 2023.02.10 License: https://www.stimulsoft.com/en/licensing/reports */ diff --git a/JavaDataAdapters/src/com/stimulsoft/js/adapter/JSDataAdapter.java b/JavaDataAdapters/src/com/stimulsoft/js/adapter/JSDataAdapter.java index b9571cc..fb963cf 100644 --- a/JavaDataAdapters/src/com/stimulsoft/js/adapter/JSDataAdapter.java +++ b/JavaDataAdapters/src/com/stimulsoft/js/adapter/JSDataAdapter.java @@ -1,7 +1,7 @@ /* Stimulsoft.Reports.JS -Version: 2023.1.6 -Build date: 2023.01.25 +Version: 2023.1.7 +Build date: 2023.02.10 License: https://www.stimulsoft.com/en/licensing/reports */ @@ -27,8 +27,8 @@ public class JSDataAdapter { - public static final String handlerVersion = "2023.1.6"; - public static final String adapterVersion = "2023.1.6"; + public static final String handlerVersion = "2023.1.7"; + public static final String adapterVersion = "2023.1.7"; public static final boolean checkVersion = true; private static final List USERS_KEYS = Arrays.asList( diff --git a/NetCoreDataAdapters/DataAdaptersController.cs b/NetCoreDataAdapters/DataAdaptersController.cs index 57c6707..3c207f9 100644 --- a/NetCoreDataAdapters/DataAdaptersController.cs +++ b/NetCoreDataAdapters/DataAdaptersController.cs @@ -1,7 +1,7 @@ /* Stimulsoft.Reports.JS -Version: 2023.1.6 -Build date: 2023.01.25 +Version: 2023.1.7 +Build date: 2023.02.10 License: https://www.stimulsoft.com/en/licensing/reports */ using FirebirdSql.Data.FirebirdClient; @@ -141,7 +141,7 @@ private async Task ProcessRequest() result.Notice = e.Message; } - result.HandlerVersion = "2023.1.6"; + result.HandlerVersion = "2023.1.7"; result.CheckVersion = true; var contentType = "application/json"; diff --git a/NetCoreDataAdapters/SQLAdapter.cs b/NetCoreDataAdapters/SQLAdapter.cs index 6e921e5..ba95607 100644 --- a/NetCoreDataAdapters/SQLAdapter.cs +++ b/NetCoreDataAdapters/SQLAdapter.cs @@ -1,7 +1,7 @@ /* Stimulsoft.Reports.JS -Version: 2023.1.6 -Build date: 2023.01.25 +Version: 2023.1.7 +Build date: 2023.02.10 License: https://www.stimulsoft.com/en/licensing/reports */ using FirebirdSql.Data.FirebirdClient; @@ -26,7 +26,7 @@ public class SQLAdapter private static Result End(Result result) { - result.AdapterVersion = "2023.1.6"; + result.AdapterVersion = "2023.1.7"; try { if (reader != null) reader.Close(); diff --git a/NetDataAdapters/Handler.ashx.cs b/NetDataAdapters/Handler.ashx.cs index 196a50c..2cfb67f 100644 --- a/NetDataAdapters/Handler.ashx.cs +++ b/NetDataAdapters/Handler.ashx.cs @@ -1,7 +1,7 @@ /* Stimulsoft.Reports.JS -Version: 2023.1.6 -Build date: 2023.01.25 +Version: 2023.1.7 +Build date: 2023.02.10 License: https://www.stimulsoft.com/en/licensing/reports */ using System; @@ -165,7 +165,7 @@ public void ProcessRequest(HttpContext context) inputStream.Close(); } - result.HandlerVersion = "2023.1.6"; + result.HandlerVersion = "2023.1.7"; result.CheckVersion = true; context.Response.Headers.Add("Access-Control-Allow-Origin", "*"); diff --git a/NetDataAdapters/SQLAdapter.cs b/NetDataAdapters/SQLAdapter.cs index 2e00b3d..b339cc5 100644 --- a/NetDataAdapters/SQLAdapter.cs +++ b/NetDataAdapters/SQLAdapter.cs @@ -1,7 +1,7 @@ /* Stimulsoft.Reports.JS -Version: 2023.1.6 -Build date: 2023.01.25 +Version: 2023.1.7 +Build date: 2023.02.10 License: https://www.stimulsoft.com/en/licensing/reports */ using FirebirdSql.Data.FirebirdClient; @@ -25,7 +25,7 @@ public class SQLAdapter private static Result End(Result result) { - result.AdapterVersion = "2023.1.6"; + result.AdapterVersion = "2023.1.7"; try { if (reader != null) reader.Close(); diff --git a/NodejsDataAdapters/FirebirdAdapter.js b/NodejsDataAdapters/FirebirdAdapter.js index d6285b1..a36b01e 100644 --- a/NodejsDataAdapters/FirebirdAdapter.js +++ b/NodejsDataAdapters/FirebirdAdapter.js @@ -1,14 +1,14 @@ /* Stimulsoft.Reports.JS -Version: 2023.1.6 -Build date: 2023.01.25 +Version: 2023.1.7 +Build date: 2023.02.10 License: https://www.stimulsoft.com/en/licensing/reports */ exports.process = function (command, onResult) { var end = function (result) { try { if (db) db.detach(); - result.adapterVersion = "2023.1.6"; + result.adapterVersion = "2023.1.7"; onResult(result); } catch (e) { diff --git a/NodejsDataAdapters/MSSQLAdapter.js b/NodejsDataAdapters/MSSQLAdapter.js index 3f4ce3c..de88cd4 100644 --- a/NodejsDataAdapters/MSSQLAdapter.js +++ b/NodejsDataAdapters/MSSQLAdapter.js @@ -1,14 +1,14 @@ /* Stimulsoft.Reports.JS -Version: 2023.1.6 -Build date: 2023.01.25 +Version: 2023.1.7 +Build date: 2023.02.10 License: https://www.stimulsoft.com/en/licensing/reports */ exports.process = function (command, onResult) { var end = function (result) { try { if (connection) connection.close(); - result.adapterVersion = "2023.1.6"; + result.adapterVersion = "2023.1.7"; onResult(result); } catch (e) { diff --git a/NodejsDataAdapters/MySQLAdapter.js b/NodejsDataAdapters/MySQLAdapter.js index e6423da..eb60c50 100644 --- a/NodejsDataAdapters/MySQLAdapter.js +++ b/NodejsDataAdapters/MySQLAdapter.js @@ -1,7 +1,7 @@ /* Stimulsoft.Reports.JS -Version: 2023.1.6 -Build date: 2023.01.25 +Version: 2023.1.7 +Build date: 2023.02.10 License: https://www.stimulsoft.com/en/licensing/reports */ exports.process = function (command, onResult) { @@ -13,7 +13,7 @@ exports.process = function (command, onResult) { catch (e) { } finally { - result.adapterVersion = "2023.1.6"; + result.adapterVersion = "2023.1.7"; onResult(result); } } diff --git a/NodejsDataAdapters/PostgreSQLAdapter.js b/NodejsDataAdapters/PostgreSQLAdapter.js index 149a352..afd8b1e 100644 --- a/NodejsDataAdapters/PostgreSQLAdapter.js +++ b/NodejsDataAdapters/PostgreSQLAdapter.js @@ -1,14 +1,14 @@ /* Stimulsoft.Reports.JS -Version: 2023.1.6 -Build date: 2023.01.25 +Version: 2023.1.7 +Build date: 2023.02.10 License: https://www.stimulsoft.com/en/licensing/reports */ exports.process = function (command, onResult) { var end = function (result) { try { if (client) client.end(); - result.adapterVersion = "2023.1.6"; + result.adapterVersion = "2023.1.7"; onResult(result); } catch (e) { diff --git a/NodejsDataAdapters/index.js b/NodejsDataAdapters/index.js index eb05426..6909228 100644 --- a/NodejsDataAdapters/index.js +++ b/NodejsDataAdapters/index.js @@ -1,7 +1,7 @@ /* Stimulsoft.Reports.JS -Version: 2023.1.6 -Build date: 2023.01.25 +Version: 2023.1.7 +Build date: 2023.02.10 License: https://www.stimulsoft.com/en/licensing/reports */ @@ -67,7 +67,7 @@ function getResponse(result) { return result } function onProcess(onResult, encryptData, result) { - result.handlerVersion = "2023.1.6"; + result.handlerVersion = "2023.1.7"; result.checkVersion = true; result.encryptData = encryptData; onResult(result); diff --git a/NodejsDataAdapters/package.json b/NodejsDataAdapters/package.json index a3e7d1c..8ab386c 100644 --- a/NodejsDataAdapters/package.json +++ b/NodejsDataAdapters/package.json @@ -1,6 +1,6 @@ { "name": "stimulsoft-data-adapter", - "version": "2023.1.6", + "version": "2023.1.7", "description": "Nodejs data adapter for Stimulsoft Reports.JS", "main": "index.js", "scripts": { diff --git a/PHPDataAdapters/StiDataAdapter.php b/PHPDataAdapters/StiDataAdapter.php index 827f74d..c2312e6 100644 --- a/PHPDataAdapters/StiDataAdapter.php +++ b/PHPDataAdapters/StiDataAdapter.php @@ -1,7 +1,7 @@ driverType == 'PDO' && mb_strlen($parameter) > 0) { + if ($this->driverType == 'PDO' && !is_null($parameter) && mb_strlen($parameter) > 0) { if (mb_strlen($this->info->dsn) > 0) $this->info->dsn .= ';'; diff --git a/PHPDataAdapters/StiFirebirdAdapter.php b/PHPDataAdapters/StiFirebirdAdapter.php index 86036ec..b159810 100644 --- a/PHPDataAdapters/StiFirebirdAdapter.php +++ b/PHPDataAdapters/StiFirebirdAdapter.php @@ -1,7 +1,7 @@ 0 && mb_substr($input, 0, 1) != '{') { + if (!is_null($input) && strlen($input) > 0 && mb_substr($input, 0, 1) != '{') { $input = base64_decode(str_rot13($input)); $this->encode = true; } diff --git a/PHPDataAdapters/classes/StiDataResult.php b/PHPDataAdapters/classes/StiDataResult.php index d426b11..e6ecf45 100644 --- a/PHPDataAdapters/classes/StiDataResult.php +++ b/PHPDataAdapters/classes/StiDataResult.php @@ -1,7 +1,7 @@