diff --git a/src/en/OInt/core/Modules/OPI_Airtable.os b/src/en/OInt/core/Modules/OPI_Airtable.os index 4ff87b73b2..01dfdeaa6f 100644 --- a/src/en/OInt/core/Modules/OPI_Airtable.os +++ b/src/en/OInt/core/Modules/OPI_Airtable.os @@ -29,6 +29,7 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OInt/core/Modules/OPI_Bitrix24.os b/src/en/OInt/core/Modules/OPI_Bitrix24.os index 5a5c15954e..50df664ff3 100644 --- a/src/en/OInt/core/Modules/OPI_Bitrix24.os +++ b/src/en/OInt/core/Modules/OPI_Bitrix24.os @@ -33,6 +33,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OInt/core/Modules/OPI_CDEK.os b/src/en/OInt/core/Modules/OPI_CDEK.os index 4445ae74f5..a6301d4221 100644 --- a/src/en/OInt/core/Modules/OPI_CDEK.os +++ b/src/en/OInt/core/Modules/OPI_CDEK.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region CommonMethods diff --git a/src/en/OInt/core/Modules/OPI_Dropbox.os b/src/en/OInt/core/Modules/OPI_Dropbox.os index 56cf13be45..a63869ba31 100644 --- a/src/en/OInt/core/Modules/OPI_Dropbox.os +++ b/src/en/OInt/core/Modules/OPI_Dropbox.os @@ -29,13 +29,12 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region AccountAndAuthorization diff --git a/src/en/OInt/core/Modules/OPI_GoogleCalendar.os b/src/en/OInt/core/Modules/OPI_GoogleCalendar.os index cd193a7af5..fdccacbbc9 100644 --- a/src/en/OInt/core/Modules/OPI_GoogleCalendar.os +++ b/src/en/OInt/core/Modules/OPI_GoogleCalendar.os @@ -31,13 +31,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region CalendarMetadataManagement diff --git a/src/en/OInt/core/Modules/OPI_GoogleDrive.os b/src/en/OInt/core/Modules/OPI_GoogleDrive.os index c0a2ae7056..58b7c0e1f1 100644 --- a/src/en/OInt/core/Modules/OPI_GoogleDrive.os +++ b/src/en/OInt/core/Modules/OPI_GoogleDrive.os @@ -31,13 +31,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region FileAndDirectoryManagement diff --git a/src/en/OInt/core/Modules/OPI_GoogleSheets.os b/src/en/OInt/core/Modules/OPI_GoogleSheets.os index cb91bdb146..6023b839f8 100644 --- a/src/en/OInt/core/Modules/OPI_GoogleSheets.os +++ b/src/en/OInt/core/Modules/OPI_GoogleSheets.os @@ -31,13 +31,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region SpreadsheetsManagement diff --git a/src/en/OInt/core/Modules/OPI_GoogleWorkspace.os b/src/en/OInt/core/Modules/OPI_GoogleWorkspace.os index 93099aac0d..ee9638dc6c 100644 --- a/src/en/OInt/core/Modules/OPI_GoogleWorkspace.os +++ b/src/en/OInt/core/Modules/OPI_GoogleWorkspace.os @@ -30,13 +30,12 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public // Generate code retrieval link diff --git a/src/en/OInt/core/Modules/OPI_GreenAPI.os b/src/en/OInt/core/Modules/OPI_GreenAPI.os index 5bd3e0a774..3a44c2893d 100644 --- a/src/en/OInt/core/Modules/OPI_GreenAPI.os +++ b/src/en/OInt/core/Modules/OPI_GreenAPI.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region Account diff --git a/src/en/OInt/core/Modules/OPI_MSSQL.os b/src/en/OInt/core/Modules/OPI_MSSQL.os index 1712728c94..c6d4664745 100644 --- a/src/en/OInt/core/Modules/OPI_MSSQL.os +++ b/src/en/OInt/core/Modules/OPI_MSSQL.os @@ -34,6 +34,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OInt/core/Modules/OPI_MySQL.os b/src/en/OInt/core/Modules/OPI_MySQL.os index b3e9ae497e..3a84ff2c2a 100644 --- a/src/en/OInt/core/Modules/OPI_MySQL.os +++ b/src/en/OInt/core/Modules/OPI_MySQL.os @@ -33,6 +33,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OInt/core/Modules/OPI_Neocities.os b/src/en/OInt/core/Modules/OPI_Neocities.os index ddd342a3b0..2b192ca860 100644 --- a/src/en/OInt/core/Modules/OPI_Neocities.os +++ b/src/en/OInt/core/Modules/OPI_Neocities.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region DataRetrieving diff --git a/src/en/OInt/core/Modules/OPI_Notion.os b/src/en/OInt/core/Modules/OPI_Notion.os index f01ef93738..b5c467a954 100644 --- a/src/en/OInt/core/Modules/OPI_Notion.os +++ b/src/en/OInt/core/Modules/OPI_Notion.os @@ -31,14 +31,13 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region PageManagement diff --git a/src/en/OInt/core/Modules/OPI_Ollama.os b/src/en/OInt/core/Modules/OPI_Ollama.os index 90591587f4..ca912989d5 100644 --- a/src/en/OInt/core/Modules/OPI_Ollama.os +++ b/src/en/OInt/core/Modules/OPI_Ollama.os @@ -32,6 +32,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OInt/core/Modules/OPI_OpenAI.os b/src/en/OInt/core/Modules/OPI_OpenAI.os index d3948734cf..641f72da96 100644 --- a/src/en/OInt/core/Modules/OPI_OpenAI.os +++ b/src/en/OInt/core/Modules/OPI_OpenAI.os @@ -32,6 +32,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -40,8 +41,6 @@ //@skip-check constructor-function-return-section //@skip-check doc-comment-collection-item-type - - #Region Public #Region RequestsProcessing diff --git a/src/en/OInt/core/Modules/OPI_Ozon.os b/src/en/OInt/core/Modules/OPI_Ozon.os index e7b18eb553..5705323c09 100644 --- a/src/en/OInt/core/Modules/OPI_Ozon.os +++ b/src/en/OInt/core/Modules/OPI_Ozon.os @@ -32,14 +32,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region AttributesAndFeatures diff --git a/src/en/OInt/core/Modules/OPI_PostgreSQL.os b/src/en/OInt/core/Modules/OPI_PostgreSQL.os index 2228500dd1..a270aa16fa 100644 --- a/src/en/OInt/core/Modules/OPI_PostgreSQL.os +++ b/src/en/OInt/core/Modules/OPI_PostgreSQL.os @@ -34,6 +34,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -42,8 +43,6 @@ //@skip-check constructor-function-return-section //@skip-check doc-comment-collection-item-type - - #Region Public #Region CommonMethods diff --git a/src/en/OInt/core/Modules/OPI_RCON.os b/src/en/OInt/core/Modules/OPI_RCON.os index d9a6347f56..e6a486fe4d 100644 --- a/src/en/OInt/core/Modules/OPI_RCON.os +++ b/src/en/OInt/core/Modules/OPI_RCON.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region CommandsExecution diff --git a/src/en/OInt/core/Modules/OPI_S3.os b/src/en/OInt/core/Modules/OPI_S3.os index b97b06f0d2..61a6211e3e 100644 --- a/src/en/OInt/core/Modules/OPI_S3.os +++ b/src/en/OInt/core/Modules/OPI_S3.os @@ -33,6 +33,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -40,8 +41,6 @@ //@skip-check method-too-many-params //@skip-check constructor-function-return-section - - #Region Public #Region CommonMethods diff --git a/src/en/OInt/core/Modules/OPI_SQLite.os b/src/en/OInt/core/Modules/OPI_SQLite.os index 5ef52e71d4..c948535b43 100644 --- a/src/en/OInt/core/Modules/OPI_SQLite.os +++ b/src/en/OInt/core/Modules/OPI_SQLite.os @@ -34,6 +34,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -41,8 +42,6 @@ //@skip-check method-too-many-params //@skip-check constructor-function-return-section - - #Region Public #Region CommonMethods diff --git a/src/en/OInt/core/Modules/OPI_Slack.os b/src/en/OInt/core/Modules/OPI_Slack.os index 671285e6c9..5e5129aab7 100644 --- a/src/en/OInt/core/Modules/OPI_Slack.os +++ b/src/en/OInt/core/Modules/OPI_Slack.os @@ -30,13 +30,12 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:Typo-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region ManagementAndSettings diff --git a/src/en/OInt/core/Modules/OPI_TCP.os b/src/en/OInt/core/Modules/OPI_TCP.os index e3deee61a2..cae5c825fb 100644 --- a/src/en/OInt/core/Modules/OPI_TCP.os +++ b/src/en/OInt/core/Modules/OPI_TCP.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region ClientMethods diff --git a/src/en/OInt/core/Modules/OPI_Telegram.os b/src/en/OInt/core/Modules/OPI_Telegram.os index cd11f8a1c9..ac10a2d211 100644 --- a/src/en/OInt/core/Modules/OPI_Telegram.os +++ b/src/en/OInt/core/Modules/OPI_Telegram.os @@ -35,13 +35,12 @@ // BSLLS:UsingServiceTag-off // BSLLS:NumberOfParams-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region DataRetrievalAndSettings @@ -236,7 +235,7 @@ Function ProcessTMAData(Val DataString, Val Token) Export Hash = ""; BinaryKey = ПолучитьДвоичныеДанныеИзСтроки(KeyString); - Result = OPI_Cryptography.HMACSHA(BinaryKey, ПолучитьДвоичныеДанныеИзСтроки(Token), "SHA256"); + Result = OPI_Cryptography.HMAC(BinaryKey, ПолучитьДвоичныеДанныеИзСтроки(Token), "SHA256"); TValue = New ValueTable; TValue.Columns.Add("Key"); diff --git a/src/en/OInt/core/Modules/OPI_Twitter.os b/src/en/OInt/core/Modules/OPI_Twitter.os index 5dd97f9797..18ed44230b 100644 --- a/src/en/OInt/core/Modules/OPI_Twitter.os +++ b/src/en/OInt/core/Modules/OPI_Twitter.os @@ -35,14 +35,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region DataAndSettings diff --git a/src/en/OInt/core/Modules/OPI_VK.os b/src/en/OInt/core/Modules/OPI_VK.os index 78ad5dd762..9bfb61d4c2 100644 --- a/src/en/OInt/core/Modules/OPI_VK.os +++ b/src/en/OInt/core/Modules/OPI_VK.os @@ -35,6 +35,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:UnusedLocalVariable-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check wrong-string-literal-content @@ -42,8 +43,6 @@ //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region TokenRetrieval diff --git a/src/en/OInt/core/Modules/OPI_VKTeams.os b/src/en/OInt/core/Modules/OPI_VKTeams.os index 96a392be5b..ce47bd04f0 100644 --- a/src/en/OInt/core/Modules/OPI_VKTeams.os +++ b/src/en/OInt/core/Modules/OPI_VKTeams.os @@ -32,14 +32,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region CommonMethods diff --git a/src/en/OInt/core/Modules/OPI_Viber.os b/src/en/OInt/core/Modules/OPI_Viber.os index 6b51bae84a..07a7748d52 100644 --- a/src/en/OInt/core/Modules/OPI_Viber.os +++ b/src/en/OInt/core/Modules/OPI_Viber.os @@ -30,13 +30,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region SettingsAndInformation diff --git a/src/en/OInt/core/Modules/OPI_YandexDisk.os b/src/en/OInt/core/Modules/OPI_YandexDisk.os index 0903d04d98..b57bc13f83 100644 --- a/src/en/OInt/core/Modules/OPI_YandexDisk.os +++ b/src/en/OInt/core/Modules/OPI_YandexDisk.os @@ -32,14 +32,13 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region FileAndFolderManagement diff --git a/src/en/OInt/core/Modules/OPI_YandexID.os b/src/en/OInt/core/Modules/OPI_YandexID.os index 1f04860b1b..8ab5c82bfa 100644 --- a/src/en/OInt/core/Modules/OPI_YandexID.os +++ b/src/en/OInt/core/Modules/OPI_YandexID.os @@ -29,13 +29,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public // Get confirmation code diff --git a/src/en/OInt/core/Modules/OPI_YandexMarket.os b/src/en/OInt/core/Modules/OPI_YandexMarket.os index 8aa909b094..afa8101057 100644 --- a/src/en/OInt/core/Modules/OPI_YandexMarket.os +++ b/src/en/OInt/core/Modules/OPI_YandexMarket.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region CampaignsAndBusiness diff --git a/src/en/OInt/core/Modules/OPI_YandexMetrika.os b/src/en/OInt/core/Modules/OPI_YandexMetrika.os index 679028a00a..0cc2688b5e 100644 --- a/src/en/OInt/core/Modules/OPI_YandexMetrika.os +++ b/src/en/OInt/core/Modules/OPI_YandexMetrika.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region TagsManagement diff --git a/src/en/OInt/tests/Modules/internal/OPI_Tests.os b/src/en/OInt/tests/Modules/internal/OPI_Tests.os index dc51e0a3b7..f35ea25bfa 100644 --- a/src/en/OInt/tests/Modules/internal/OPI_Tests.os +++ b/src/en/OInt/tests/Modules/internal/OPI_Tests.os @@ -44,6 +44,7 @@ // BSLLS:UnusedLocalMethod-off // BSLLS:NestedFunctionInParameters-off // BSLLS:MissingTemporaryFileDeletion-off +// BSLLS:UsingSynchronousCalls-off //@skip-check undefined-variable //@skip-check wrong-string-literal-content diff --git a/src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os b/src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os index 34e1b88eca..23234d204a 100644 --- a/src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os +++ b/src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os @@ -44,6 +44,7 @@ // BSLLS:UnusedLocalMethod-off // BSLLS:NestedFunctionInParameters-off // BSLLS:MissingTemporaryFileDeletion-off +// BSLLS:UsingSynchronousCalls-off //@skip-check undefined-variable //@skip-check wrong-string-literal-content diff --git a/src/en/OInt/tools/Modules/OPI_AddIns.os b/src/en/OInt/tools/Modules/OPI_AddIns.os index 80e59333dd..699c654751 100644 --- a/src/en/OInt/tools/Modules/OPI_AddIns.os +++ b/src/en/OInt/tools/Modules/OPI_AddIns.os @@ -34,6 +34,7 @@ // BSLLS:DuplicateStringLiteral-off // BSLLS:MagicNumber-off // BSLLS:UsingHardcodeNetworkAddress-off +// BSLLS:UsingSynchronousCalls-off //@skip-check use-non-recommended-method //@skip-check module-structure-top-region diff --git a/src/en/OInt/tools/Modules/OPI_HTTPRequests.os b/src/en/OInt/tools/Modules/OPI_HTTPRequests.os index 96206c9dbd..d304eb20f1 100644 --- a/src/en/OInt/tools/Modules/OPI_HTTPRequests.os +++ b/src/en/OInt/tools/Modules/OPI_HTTPRequests.os @@ -30,6 +30,7 @@ // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off // BSLLS:NumberOfOptionalParams-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-unused-local-variable //@skip-check method-too-many-params diff --git a/src/en/OInt/tools/Modules/OPI_SQLQueries.os b/src/en/OInt/tools/Modules/OPI_SQLQueries.os index dcfc593ead..9540a6623a 100644 --- a/src/en/OInt/tools/Modules/OPI_SQLQueries.os +++ b/src/en/OInt/tools/Modules/OPI_SQLQueries.os @@ -33,6 +33,7 @@ // BSLLS:QueryParseError-off // BSLLS:AssignAliasFieldsInQuery-off // BSLLS:NumberOfParams-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -165,69 +166,14 @@ Function EnsureTable(Val Module If Not ValueIsFilled(TableColumns) Then ResultStrucutre = CreateTable(Module, Table, ColoumnsStruct, Connection, Tls); - Else - FoundMapping = New Map; - FieldName = Module.GetFeatures()["ColumnField"]; + Error = NormalizeTable(Module, Table, ColoumnsStruct, TableColumns, Connection, Tls); - DeleteCode = 0; - AddCode = 1; - IgnoreCode = 2; - - For Each Coloumn In TableColumns Do - - ColumnName = Coloumn[FieldName]; - - If Not ValueIsFilled(ColumnName) Then - Continue; - Else - FoundMapping.Insert(ColumnName, DeleteCode); - EndIf; - - EndDo; - - If FoundMapping.Count() = 0 Then - ResponseMapping = New Map; - ResponseMapping.Insert("result", "false"); - ResponseMapping.Insert("error" , "Unsupported table schema type"); - Return ResponseMapping; + If Error <> Undefined Then + Return Error; EndIf; - For Each RequiredColumn In ColoumnsStruct Do - - ColumnName = RequiredColumn.Key; - Exist = FoundMapping.Get(ColumnName) <> Undefined; - Action = ?(Exist, IgnoreCode, AddCode); - - FoundMapping.Insert(ColumnName, Action); - - EndDo; - - For Each SchemaPart In FoundMapping Do - - ActionCode = SchemaPart.Value; - ColumnName = SchemaPart.Key; - - If ActionCode = 0 Then - - Result = DeleteTableColumn(Module, Table, ColumnName, Connection, Tls); - - ElsIf ActionCode = 1 Then - - DataType = ColoumnsStruct[ColumnName]; - Result = AddTableColumn(Module, Table, ColumnName, DataType, Connection, Tls); - - Else - Continue; - EndIf; - - If Not Result["result"] Then - Raise Result["error"]; - EndIf; - - EndDo; - EndIf; Completion = Module.ExecuteSQLQuery("COMMIT;", , , Connection); @@ -1103,6 +1049,77 @@ Function AddRow(Val Module, Val Table, Val Record, Val Connection) EndFunction +Function NormalizeTable(Val Module + , Val Table + , Val ColoumnsStruct + , TableColumns + , Val Connection + , Val Tls) + + FoundMapping = New Map; + FieldName = Module.GetFeatures()["ColumnField"]; + + DeleteCode = 0; + AddCode = 1; + IgnoreCode = 2; + + For Each Coloumn In TableColumns Do + + ColumnName = Coloumn[FieldName]; + + If Not ValueIsFilled(ColumnName) Then + Continue; + Else + FoundMapping.Insert(ColumnName, DeleteCode); + EndIf; + + EndDo; + + If FoundMapping.Count() = 0 Then + ResponseMapping = New Map; + ResponseMapping.Insert("result", "false"); + ResponseMapping.Insert("error" , "Unsupported table schema type"); + Return ResponseMapping; + EndIf; + + For Each RequiredColumn In ColoumnsStruct Do + + ColumnName = RequiredColumn.Key; + Exist = FoundMapping.Get(ColumnName) <> Undefined; + Action = ?(Exist, IgnoreCode, AddCode); + + FoundMapping.Insert(ColumnName, Action); + + EndDo; + + For Each SchemaPart In FoundMapping Do + + ActionCode = SchemaPart.Value; + ColumnName = SchemaPart.Key; + + If ActionCode = 0 Then + + Result = DeleteTableColumn(Module, Table, ColumnName, Connection, Tls); + + ElsIf ActionCode = 1 Then + + DataType = ColoumnsStruct[ColumnName]; + Result = AddTableColumn(Module, Table, ColumnName, DataType, Connection, Tls); + + Else + Continue; + EndIf; + + If Not Result["result"] Then + Raise Result["error"]; + EndIf; + + EndDo; + + Return Undefined; + +EndFunction + Function FormFilterText(Val Filters) If Not ValueIsFilled(Filters) Then diff --git a/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os b/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os index adea79a283..1d535500d8 100644 --- a/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os +++ b/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os @@ -34,6 +34,7 @@ // BSLLS:DuplicateStringLiteral-off // BSLLS:MagicNumber-off // BSLLS:UsingHardcodeNetworkAddress-off +// BSLLS:UsingSynchronousCalls-off //@skip-check use-non-recommended-method //@skip-check module-structure-top-region diff --git a/src/en/OInt/tools/Modules/OPI_TypeConversion.os b/src/en/OInt/tools/Modules/OPI_TypeConversion.os index 936612d8e8..bdaa2aaa05 100644 --- a/src/en/OInt/tools/Modules/OPI_TypeConversion.os +++ b/src/en/OInt/tools/Modules/OPI_TypeConversion.os @@ -28,6 +28,7 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os b/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os index e03ba7d95a..a32c46c0c2 100644 --- a/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os +++ b/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os @@ -28,6 +28,7 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os b/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os index 10e75582a4..73d8d15619 100644 --- a/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os +++ b/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os @@ -30,6 +30,7 @@ // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off // BSLLS:NumberOfOptionalParams-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-unused-local-variable //@skip-check method-too-many-params diff --git a/src/en/OPI/src/CommonModules/OPI_AddIns/Module.bsl b/src/en/OPI/src/CommonModules/OPI_AddIns/Module.bsl index 7bde4ba658..70e511076d 100644 --- a/src/en/OPI/src/CommonModules/OPI_AddIns/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_AddIns/Module.bsl @@ -34,6 +34,7 @@ // BSLLS:DuplicateStringLiteral-off // BSLLS:MagicNumber-off // BSLLS:UsingHardcodeNetworkAddress-off +// BSLLS:UsingSynchronousCalls-off //@skip-check use-non-recommended-method //@skip-check module-structure-top-region diff --git a/src/en/OPI/src/CommonModules/OPI_Airtable/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Airtable/Module.bsl index aab9714e88..e5b6922e14 100644 --- a/src/en/OPI/src/CommonModules/OPI_Airtable/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Airtable/Module.bsl @@ -29,6 +29,7 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OPI/src/CommonModules/OPI_Bitrix24/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Bitrix24/Module.bsl index 4c21eba2bb..dc694ba185 100644 --- a/src/en/OPI/src/CommonModules/OPI_Bitrix24/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Bitrix24/Module.bsl @@ -33,6 +33,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OPI/src/CommonModules/OPI_CDEK/Module.bsl b/src/en/OPI/src/CommonModules/OPI_CDEK/Module.bsl index 10064f8a53..b1f6f5261a 100644 --- a/src/en/OPI/src/CommonModules/OPI_CDEK/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_CDEK/Module.bsl @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region CommonMethods diff --git a/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl index a7f28deb27..ab7c47529b 100644 --- a/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl @@ -28,6 +28,7 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl index 09756a511f..8252cceb16 100644 --- a/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl @@ -29,13 +29,12 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region AccountAndAuthorization diff --git a/src/en/OPI/src/CommonModules/OPI_GoogleCalendar/Module.bsl b/src/en/OPI/src/CommonModules/OPI_GoogleCalendar/Module.bsl index a8863da80f..a3da2ddb43 100644 --- a/src/en/OPI/src/CommonModules/OPI_GoogleCalendar/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_GoogleCalendar/Module.bsl @@ -31,13 +31,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region CalendarMetadataManagement diff --git a/src/en/OPI/src/CommonModules/OPI_GoogleDrive/Module.bsl b/src/en/OPI/src/CommonModules/OPI_GoogleDrive/Module.bsl index f1301362ee..6c7c65b99b 100644 --- a/src/en/OPI/src/CommonModules/OPI_GoogleDrive/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_GoogleDrive/Module.bsl @@ -31,13 +31,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region FileAndDirectoryManagement diff --git a/src/en/OPI/src/CommonModules/OPI_GoogleSheets/Module.bsl b/src/en/OPI/src/CommonModules/OPI_GoogleSheets/Module.bsl index 9a849d5983..8bc087989f 100644 --- a/src/en/OPI/src/CommonModules/OPI_GoogleSheets/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_GoogleSheets/Module.bsl @@ -31,13 +31,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region SpreadsheetsManagement diff --git a/src/en/OPI/src/CommonModules/OPI_GoogleWorkspace/Module.bsl b/src/en/OPI/src/CommonModules/OPI_GoogleWorkspace/Module.bsl index 7f0c3ffb91..bfd71e6eea 100644 --- a/src/en/OPI/src/CommonModules/OPI_GoogleWorkspace/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_GoogleWorkspace/Module.bsl @@ -30,13 +30,12 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public // Generate code retrieval link diff --git a/src/en/OPI/src/CommonModules/OPI_GreenAPI/Module.bsl b/src/en/OPI/src/CommonModules/OPI_GreenAPI/Module.bsl index 848c7244a7..b81a3a0ab2 100644 --- a/src/en/OPI/src/CommonModules/OPI_GreenAPI/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_GreenAPI/Module.bsl @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region Account diff --git a/src/en/OPI/src/CommonModules/OPI_HTTPRequests/Module.bsl b/src/en/OPI/src/CommonModules/OPI_HTTPRequests/Module.bsl index f23e4486d9..96c61d2409 100644 --- a/src/en/OPI/src/CommonModules/OPI_HTTPRequests/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_HTTPRequests/Module.bsl @@ -30,6 +30,7 @@ // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off // BSLLS:NumberOfOptionalParams-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-unused-local-variable //@skip-check method-too-many-params diff --git a/src/en/OPI/src/CommonModules/OPI_MSSQL/Module.bsl b/src/en/OPI/src/CommonModules/OPI_MSSQL/Module.bsl index 61a9629d32..bdeca88c5f 100644 --- a/src/en/OPI/src/CommonModules/OPI_MSSQL/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_MSSQL/Module.bsl @@ -34,6 +34,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OPI/src/CommonModules/OPI_MySQL/Module.bsl b/src/en/OPI/src/CommonModules/OPI_MySQL/Module.bsl index 526a66d522..efe07a7143 100644 --- a/src/en/OPI/src/CommonModules/OPI_MySQL/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_MySQL/Module.bsl @@ -33,6 +33,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OPI/src/CommonModules/OPI_Neocities/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Neocities/Module.bsl index 0ab7c0c0df..7abe8d859a 100644 --- a/src/en/OPI/src/CommonModules/OPI_Neocities/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Neocities/Module.bsl @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region DataRetrieving diff --git a/src/en/OPI/src/CommonModules/OPI_Notion/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Notion/Module.bsl index 24e1c6818e..2c5dc644bb 100644 --- a/src/en/OPI/src/CommonModules/OPI_Notion/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Notion/Module.bsl @@ -31,14 +31,13 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region PageManagement diff --git a/src/en/OPI/src/CommonModules/OPI_Ollama/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Ollama/Module.bsl index fb63164a74..811141f39e 100644 --- a/src/en/OPI/src/CommonModules/OPI_Ollama/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Ollama/Module.bsl @@ -32,6 +32,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OPI/src/CommonModules/OPI_OpenAI/Module.bsl b/src/en/OPI/src/CommonModules/OPI_OpenAI/Module.bsl index adc328d732..3e96f2b887 100644 --- a/src/en/OPI/src/CommonModules/OPI_OpenAI/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_OpenAI/Module.bsl @@ -32,6 +32,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -40,8 +41,6 @@ //@skip-check constructor-function-return-section //@skip-check doc-comment-collection-item-type - - #Region Public #Region RequestsProcessing diff --git a/src/en/OPI/src/CommonModules/OPI_Ozon/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Ozon/Module.bsl index b5e65168c2..fded9db3a1 100644 --- a/src/en/OPI/src/CommonModules/OPI_Ozon/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Ozon/Module.bsl @@ -32,14 +32,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region AttributesAndFeatures diff --git a/src/en/OPI/src/CommonModules/OPI_PostgreSQL/Module.bsl b/src/en/OPI/src/CommonModules/OPI_PostgreSQL/Module.bsl index bb00c10cab..2d87c2d836 100644 --- a/src/en/OPI/src/CommonModules/OPI_PostgreSQL/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_PostgreSQL/Module.bsl @@ -34,6 +34,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -42,8 +43,6 @@ //@skip-check constructor-function-return-section //@skip-check doc-comment-collection-item-type - - #Region Public #Region CommonMethods diff --git a/src/en/OPI/src/CommonModules/OPI_RCON/Module.bsl b/src/en/OPI/src/CommonModules/OPI_RCON/Module.bsl index 4dc42bb5fa..6633c56cb6 100644 --- a/src/en/OPI/src/CommonModules/OPI_RCON/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_RCON/Module.bsl @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region CommandsExecution diff --git a/src/en/OPI/src/CommonModules/OPI_S3/Module.bsl b/src/en/OPI/src/CommonModules/OPI_S3/Module.bsl index 5fc459b09e..8e3c535f55 100644 --- a/src/en/OPI/src/CommonModules/OPI_S3/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_S3/Module.bsl @@ -33,6 +33,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -40,8 +41,6 @@ //@skip-check method-too-many-params //@skip-check constructor-function-return-section - - #Region Public #Region CommonMethods diff --git a/src/en/OPI/src/CommonModules/OPI_SQLQueries/Module.bsl b/src/en/OPI/src/CommonModules/OPI_SQLQueries/Module.bsl index d0c70b5737..25aecbb20c 100644 --- a/src/en/OPI/src/CommonModules/OPI_SQLQueries/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_SQLQueries/Module.bsl @@ -33,6 +33,7 @@ // BSLLS:QueryParseError-off // BSLLS:AssignAliasFieldsInQuery-off // BSLLS:NumberOfParams-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -165,69 +166,14 @@ Function EnsureTable(Val Module If Not ValueIsFilled(TableColumns) Then ResultStrucutre = CreateTable(Module, Table, ColoumnsStruct, Connection, Tls); - Else - FoundMapping = New Map; - FieldName = Module.GetFeatures()["ColumnField"]; + Error = NormalizeTable(Module, Table, ColoumnsStruct, TableColumns, Connection, Tls); - DeleteCode = 0; - AddCode = 1; - IgnoreCode = 2; - - For Each Coloumn In TableColumns Do - - ColumnName = Coloumn[FieldName]; - - If Not ValueIsFilled(ColumnName) Then - Continue; - Else - FoundMapping.Insert(ColumnName, DeleteCode); - EndIf; - - EndDo; - - If FoundMapping.Count() = 0 Then - ResponseMapping = New Map; - ResponseMapping.Insert("result", "false"); - ResponseMapping.Insert("error" , "Unsupported table schema type"); - Return ResponseMapping; + If Error <> Undefined Then + Return Error; EndIf; - For Each RequiredColumn In ColoumnsStruct Do - - ColumnName = RequiredColumn.Key; - Exists = FoundMapping.Get(ColumnName) <> Undefined; - Action = ?(Exists, IgnoreCode, AddCode); - - FoundMapping.Insert(ColumnName, Action); - - EndDo; - - For Each SchemaPart In FoundMapping Do - - ActionCode = SchemaPart.Value; - ColumnName = SchemaPart.Key; - - If ActionCode = 0 Then - - Result = DeleteTableColumn(Module, Table, ColumnName, Connection, Tls); - - ElsIf ActionCode = 1 Then - - DataType = ColoumnsStruct[ColumnName]; - Result = AddTableColumn(Module, Table, ColumnName, DataType, Connection, Tls); - - Else - Continue; - EndIf; - - If Not Result["result"] Then - Raise Result["error"]; - EndIf; - - EndDo; - EndIf; Completion = Module.ExecuteSQLQuery("COMMIT;", , , Connection); @@ -1103,6 +1049,77 @@ Function AddRow(Val Module, Val Table, Val Record, Val Connection) EndFunction +Function NormalizeTable(Val Module + , Val Table + , Val ColoumnsStruct + , TableColumns + , Val Connection + , Val Tls) + + FoundMapping = New Map; + FieldName = Module.GetFeatures()["ColumnField"]; + + DeleteCode = 0; + AddCode = 1; + IgnoreCode = 2; + + For Each Coloumn In TableColumns Do + + ColumnName = Coloumn[FieldName]; + + If Not ValueIsFilled(ColumnName) Then + Continue; + Else + FoundMapping.Insert(ColumnName, DeleteCode); + EndIf; + + EndDo; + + If FoundMapping.Count() = 0 Then + ResponseMapping = New Map; + ResponseMapping.Insert("result", "false"); + ResponseMapping.Insert("error" , "Unsupported table schema type"); + Return ResponseMapping; + EndIf; + + For Each RequiredColumn In ColoumnsStruct Do + + ColumnName = RequiredColumn.Key; + Exists = FoundMapping.Get(ColumnName) <> Undefined; + Action = ?(Exists, IgnoreCode, AddCode); + + FoundMapping.Insert(ColumnName, Action); + + EndDo; + + For Each SchemaPart In FoundMapping Do + + ActionCode = SchemaPart.Value; + ColumnName = SchemaPart.Key; + + If ActionCode = 0 Then + + Result = DeleteTableColumn(Module, Table, ColumnName, Connection, Tls); + + ElsIf ActionCode = 1 Then + + DataType = ColoumnsStruct[ColumnName]; + Result = AddTableColumn(Module, Table, ColumnName, DataType, Connection, Tls); + + Else + Continue; + EndIf; + + If Not Result["result"] Then + Raise Result["error"]; + EndIf; + + EndDo; + + Return Undefined; + +EndFunction + Function FormFilterText(Val Filters) If Not ValueIsFilled(Filters) Then diff --git a/src/en/OPI/src/CommonModules/OPI_SQLite/Module.bsl b/src/en/OPI/src/CommonModules/OPI_SQLite/Module.bsl index 670bb1300f..0a616f951a 100644 --- a/src/en/OPI/src/CommonModules/OPI_SQLite/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_SQLite/Module.bsl @@ -34,6 +34,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -41,8 +42,6 @@ //@skip-check method-too-many-params //@skip-check constructor-function-return-section - - #Region Public #Region CommonMethods diff --git a/src/en/OPI/src/CommonModules/OPI_Slack/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Slack/Module.bsl index 874b642685..c985d8cf86 100644 --- a/src/en/OPI/src/CommonModules/OPI_Slack/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Slack/Module.bsl @@ -30,13 +30,12 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:Typo-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region ManagementAndSettings diff --git a/src/en/OPI/src/CommonModules/OPI_TCP/Module.bsl b/src/en/OPI/src/CommonModules/OPI_TCP/Module.bsl index e679485166..f7ccf9dac3 100644 --- a/src/en/OPI/src/CommonModules/OPI_TCP/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_TCP/Module.bsl @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region ClientMethods diff --git a/src/en/OPI/src/CommonModules/OPI_Telegram/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Telegram/Module.bsl index 2699e0ed1e..6b6f3e417b 100644 --- a/src/en/OPI/src/CommonModules/OPI_Telegram/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Telegram/Module.bsl @@ -35,13 +35,12 @@ // BSLLS:UsingServiceTag-off // BSLLS:NumberOfParams-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region DataRetrievalAndSettings @@ -236,7 +235,7 @@ Function ProcessTMAData(Val DataString, Val Token) Export Hash = ""; BinaryKey = GetBinaryDataFromString(KeyString); - Result = OPI_Cryptography.HMACSHA(BinaryKey, GetBinaryDataFromString(Token), "SHA256"); + Result = OPI_Cryptography.HMAC(BinaryKey, GetBinaryDataFromString(Token), "SHA256"); TValue = New ValueTable; TValue.Columns.Add("Key"); diff --git a/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl b/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl index b14e96ab97..76ab9477b3 100644 --- a/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl @@ -34,6 +34,7 @@ // BSLLS:DuplicateStringLiteral-off // BSLLS:MagicNumber-off // BSLLS:UsingHardcodeNetworkAddress-off +// BSLLS:UsingSynchronousCalls-off //@skip-check use-non-recommended-method //@skip-check module-structure-top-region diff --git a/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl index ad6806f442..46987acfe6 100644 --- a/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl @@ -44,6 +44,7 @@ // BSLLS:UnusedLocalMethod-off // BSLLS:NestedFunctionInParameters-off // BSLLS:MissingTemporaryFileDeletion-off +// BSLLS:UsingSynchronousCalls-off //@skip-check undefined-variable //@skip-check wrong-string-literal-content diff --git a/src/en/OPI/src/CommonModules/OPI_TestsCLI/Module.bsl b/src/en/OPI/src/CommonModules/OPI_TestsCLI/Module.bsl index 5723b1cc4d..a15beba787 100644 --- a/src/en/OPI/src/CommonModules/OPI_TestsCLI/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_TestsCLI/Module.bsl @@ -44,6 +44,7 @@ // BSLLS:UnusedLocalMethod-off // BSLLS:NestedFunctionInParameters-off // BSLLS:MissingTemporaryFileDeletion-off +// BSLLS:UsingSynchronousCalls-off //@skip-check undefined-variable //@skip-check wrong-string-literal-content diff --git a/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl index a59a6f80e2..eb60b47a50 100644 --- a/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl @@ -30,6 +30,7 @@ // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off // BSLLS:NumberOfOptionalParams-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-unused-local-variable //@skip-check method-too-many-params diff --git a/src/en/OPI/src/CommonModules/OPI_Twitter/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Twitter/Module.bsl index 1b52a5f98d..e24616830c 100644 --- a/src/en/OPI/src/CommonModules/OPI_Twitter/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Twitter/Module.bsl @@ -35,14 +35,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region DataAndSettings diff --git a/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl b/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl index f28f6b951a..f8feb704f6 100644 --- a/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl @@ -28,6 +28,7 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/en/OPI/src/CommonModules/OPI_VK/Module.bsl b/src/en/OPI/src/CommonModules/OPI_VK/Module.bsl index 013340513e..4852a692c9 100644 --- a/src/en/OPI/src/CommonModules/OPI_VK/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_VK/Module.bsl @@ -35,6 +35,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:UnusedLocalVariable-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check wrong-string-literal-content @@ -42,8 +43,6 @@ //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region TokenRetrieval diff --git a/src/en/OPI/src/CommonModules/OPI_VKTeams/Module.bsl b/src/en/OPI/src/CommonModules/OPI_VKTeams/Module.bsl index 30eab83ed0..faba916f17 100644 --- a/src/en/OPI/src/CommonModules/OPI_VKTeams/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_VKTeams/Module.bsl @@ -32,14 +32,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region CommonMethods diff --git a/src/en/OPI/src/CommonModules/OPI_Viber/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Viber/Module.bsl index ffb263ee08..2be1775a1b 100644 --- a/src/en/OPI/src/CommonModules/OPI_Viber/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Viber/Module.bsl @@ -30,13 +30,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region SettingsAndInformation diff --git a/src/en/OPI/src/CommonModules/OPI_YandexDisk/Module.bsl b/src/en/OPI/src/CommonModules/OPI_YandexDisk/Module.bsl index 72c702fc8b..b5edf369db 100644 --- a/src/en/OPI/src/CommonModules/OPI_YandexDisk/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_YandexDisk/Module.bsl @@ -32,14 +32,13 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public #Region FileAndFolderManagement diff --git a/src/en/OPI/src/CommonModules/OPI_YandexID/Module.bsl b/src/en/OPI/src/CommonModules/OPI_YandexID/Module.bsl index 78939a6605..843d2e9e82 100644 --- a/src/en/OPI/src/CommonModules/OPI_YandexID/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_YandexID/Module.bsl @@ -29,13 +29,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Region Public // Get confirmation code diff --git a/src/en/OPI/src/CommonModules/OPI_YandexMarket/Module.bsl b/src/en/OPI/src/CommonModules/OPI_YandexMarket/Module.bsl index 43690c408b..9e582650a4 100644 --- a/src/en/OPI/src/CommonModules/OPI_YandexMarket/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_YandexMarket/Module.bsl @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region CampaignsAndBusiness diff --git a/src/en/OPI/src/CommonModules/OPI_YandexMetrika/Module.bsl b/src/en/OPI/src/CommonModules/OPI_YandexMetrika/Module.bsl index 61b8902cb5..907492ac3e 100644 --- a/src/en/OPI/src/CommonModules/OPI_YandexMetrika/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_YandexMetrika/Module.bsl @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Region Public #Region TagsManagement diff --git a/src/en/cli/data/Classes/internal/Classes/tools.os b/src/en/cli/data/Classes/internal/Classes/tools.os index 72d8009dcc..5263035fcb 100644 --- a/src/en/cli/data/Classes/internal/Classes/tools.os +++ b/src/en/cli/data/Classes/internal/Classes/tools.os @@ -82,7 +82,7 @@ Function GetConnectionString() Export | | - | Utils = LoadScript(""C:/ProgramData/Jenkins/.jenkins/workspace/OpiSonar/src/en/cli/tools/Modules/Utils.os"", Context); + | Utils = LoadScript(""C:/ProgramData/Jenkins/.jenkins/workspace/OpiMain/src/en/cli/tools/Modules/Utils.os"", Context); |" + Chars.LF; diff --git a/src/ru/OInt/core/Modules/OPI_Airtable.os b/src/ru/OInt/core/Modules/OPI_Airtable.os index 759539d442..45801061bb 100644 --- a/src/ru/OInt/core/Modules/OPI_Airtable.os +++ b/src/ru/OInt/core/Modules/OPI_Airtable.os @@ -29,6 +29,7 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/ru/OInt/core/Modules/OPI_Bitrix24.os b/src/ru/OInt/core/Modules/OPI_Bitrix24.os index 3e50d22fdf..d793cfeb79 100644 --- a/src/ru/OInt/core/Modules/OPI_Bitrix24.os +++ b/src/ru/OInt/core/Modules/OPI_Bitrix24.os @@ -33,6 +33,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/ru/OInt/core/Modules/OPI_CDEK.os b/src/ru/OInt/core/Modules/OPI_CDEK.os index 142881c8f2..b617650161 100644 --- a/src/ru/OInt/core/Modules/OPI_CDEK.os +++ b/src/ru/OInt/core/Modules/OPI_CDEK.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Область ПрограммныйИнтерфейс #Область ОбщиеМетоды diff --git a/src/ru/OInt/core/Modules/OPI_Dropbox.os b/src/ru/OInt/core/Modules/OPI_Dropbox.os index 4be45a4791..88d3e1141c 100644 --- a/src/ru/OInt/core/Modules/OPI_Dropbox.os +++ b/src/ru/OInt/core/Modules/OPI_Dropbox.os @@ -29,13 +29,12 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс #Область АккаунтИАвторизация diff --git a/src/ru/OInt/core/Modules/OPI_GoogleCalendar.os b/src/ru/OInt/core/Modules/OPI_GoogleCalendar.os index 43d78d73e1..e5964bd082 100644 --- a/src/ru/OInt/core/Modules/OPI_GoogleCalendar.os +++ b/src/ru/OInt/core/Modules/OPI_GoogleCalendar.os @@ -31,13 +31,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс #Область РаботаСМетаданнымиКалендарей diff --git a/src/ru/OInt/core/Modules/OPI_GoogleDrive.os b/src/ru/OInt/core/Modules/OPI_GoogleDrive.os index d7c3cdf370..4efd964e87 100644 --- a/src/ru/OInt/core/Modules/OPI_GoogleDrive.os +++ b/src/ru/OInt/core/Modules/OPI_GoogleDrive.os @@ -31,13 +31,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс #Область РаботаСФайламиИКаталогами diff --git a/src/ru/OInt/core/Modules/OPI_GoogleSheets.os b/src/ru/OInt/core/Modules/OPI_GoogleSheets.os index 5e7ec49cae..e253be47c0 100644 --- a/src/ru/OInt/core/Modules/OPI_GoogleSheets.os +++ b/src/ru/OInt/core/Modules/OPI_GoogleSheets.os @@ -31,13 +31,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс #Область РаботаСКнигами diff --git a/src/ru/OInt/core/Modules/OPI_GoogleWorkspace.os b/src/ru/OInt/core/Modules/OPI_GoogleWorkspace.os index 42c0562501..3670b02648 100644 --- a/src/ru/OInt/core/Modules/OPI_GoogleWorkspace.os +++ b/src/ru/OInt/core/Modules/OPI_GoogleWorkspace.os @@ -30,13 +30,12 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс // Сформировать ссылку получения кода diff --git a/src/ru/OInt/core/Modules/OPI_GreenAPI.os b/src/ru/OInt/core/Modules/OPI_GreenAPI.os index 6b1ddb8830..acc4585520 100644 --- a/src/ru/OInt/core/Modules/OPI_GreenAPI.os +++ b/src/ru/OInt/core/Modules/OPI_GreenAPI.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Область ПрограммныйИнтерфейс #Область Аккаунт diff --git a/src/ru/OInt/core/Modules/OPI_MSSQL.os b/src/ru/OInt/core/Modules/OPI_MSSQL.os index beeb844a4c..751501a5f4 100644 --- a/src/ru/OInt/core/Modules/OPI_MSSQL.os +++ b/src/ru/OInt/core/Modules/OPI_MSSQL.os @@ -34,6 +34,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/ru/OInt/core/Modules/OPI_MySQL.os b/src/ru/OInt/core/Modules/OPI_MySQL.os index 83ca452c46..ecc59db8a5 100644 --- a/src/ru/OInt/core/Modules/OPI_MySQL.os +++ b/src/ru/OInt/core/Modules/OPI_MySQL.os @@ -33,6 +33,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/ru/OInt/core/Modules/OPI_Neocities.os b/src/ru/OInt/core/Modules/OPI_Neocities.os index 2db1514066..1395231cfc 100644 --- a/src/ru/OInt/core/Modules/OPI_Neocities.os +++ b/src/ru/OInt/core/Modules/OPI_Neocities.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Область ПрограммныйИнтерфейс #Область ПолучениеДанных diff --git a/src/ru/OInt/core/Modules/OPI_Notion.os b/src/ru/OInt/core/Modules/OPI_Notion.os index d0c86093a8..cd5b33eb25 100644 --- a/src/ru/OInt/core/Modules/OPI_Notion.os +++ b/src/ru/OInt/core/Modules/OPI_Notion.os @@ -31,14 +31,13 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс #Область РаботаСоСтраницами diff --git a/src/ru/OInt/core/Modules/OPI_Ollama.os b/src/ru/OInt/core/Modules/OPI_Ollama.os index 5150a9f55b..c9e7ff8766 100644 --- a/src/ru/OInt/core/Modules/OPI_Ollama.os +++ b/src/ru/OInt/core/Modules/OPI_Ollama.os @@ -32,6 +32,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/ru/OInt/core/Modules/OPI_OpenAI.os b/src/ru/OInt/core/Modules/OPI_OpenAI.os index 51e600b366..064f57ae10 100644 --- a/src/ru/OInt/core/Modules/OPI_OpenAI.os +++ b/src/ru/OInt/core/Modules/OPI_OpenAI.os @@ -32,6 +32,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -40,8 +41,6 @@ //@skip-check constructor-function-return-section //@skip-check doc-comment-collection-item-type - - #Область ПрограммныйИнтерфейс #Область ОбработкаЗапросов diff --git a/src/ru/OInt/core/Modules/OPI_Ozon.os b/src/ru/OInt/core/Modules/OPI_Ozon.os index ce2043360a..ffc36c540e 100644 --- a/src/ru/OInt/core/Modules/OPI_Ozon.os +++ b/src/ru/OInt/core/Modules/OPI_Ozon.os @@ -32,14 +32,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Область ПрограммныйИнтерфейс #Область АтрибутыИХарактеристики diff --git a/src/ru/OInt/core/Modules/OPI_PostgreSQL.os b/src/ru/OInt/core/Modules/OPI_PostgreSQL.os index 5e923b3e77..243f5f0542 100644 --- a/src/ru/OInt/core/Modules/OPI_PostgreSQL.os +++ b/src/ru/OInt/core/Modules/OPI_PostgreSQL.os @@ -34,6 +34,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -42,8 +43,6 @@ //@skip-check constructor-function-return-section //@skip-check doc-comment-collection-item-type - - #Область ПрограммныйИнтерфейс #Область ОсновныеМетоды diff --git a/src/ru/OInt/core/Modules/OPI_RCON.os b/src/ru/OInt/core/Modules/OPI_RCON.os index ae6f395139..412433eaa4 100644 --- a/src/ru/OInt/core/Modules/OPI_RCON.os +++ b/src/ru/OInt/core/Modules/OPI_RCON.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Область ПрограммныйИнтерфейс #Область ВыполнениеКоманд diff --git a/src/ru/OInt/core/Modules/OPI_S3.os b/src/ru/OInt/core/Modules/OPI_S3.os index 6cdd223a64..eb4683e8cc 100644 --- a/src/ru/OInt/core/Modules/OPI_S3.os +++ b/src/ru/OInt/core/Modules/OPI_S3.os @@ -33,6 +33,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -40,8 +41,6 @@ //@skip-check method-too-many-params //@skip-check constructor-function-return-section - - #Область ПрограммныйИнтерфейс #Область ОбщиеМетоды diff --git a/src/ru/OInt/core/Modules/OPI_SQLite.os b/src/ru/OInt/core/Modules/OPI_SQLite.os index 8d66f71af5..6e52a3f771 100644 --- a/src/ru/OInt/core/Modules/OPI_SQLite.os +++ b/src/ru/OInt/core/Modules/OPI_SQLite.os @@ -34,6 +34,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -41,8 +42,6 @@ //@skip-check method-too-many-params //@skip-check constructor-function-return-section - - #Область ПрограммныйИнтерфейс #Область ОсновныеМетоды diff --git a/src/ru/OInt/core/Modules/OPI_Slack.os b/src/ru/OInt/core/Modules/OPI_Slack.os index 483b691865..e56c2387f4 100644 --- a/src/ru/OInt/core/Modules/OPI_Slack.os +++ b/src/ru/OInt/core/Modules/OPI_Slack.os @@ -30,13 +30,12 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:Typo-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс #Область УправлениеИНастройки diff --git a/src/ru/OInt/core/Modules/OPI_TCP.os b/src/ru/OInt/core/Modules/OPI_TCP.os index 17eda13892..cfbeddaf8e 100644 --- a/src/ru/OInt/core/Modules/OPI_TCP.os +++ b/src/ru/OInt/core/Modules/OPI_TCP.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Область ПрограммныйИнтерфейс #Область МетодыКлиента diff --git a/src/ru/OInt/core/Modules/OPI_Telegram.os b/src/ru/OInt/core/Modules/OPI_Telegram.os index 6874eb591d..49f2d73997 100644 --- a/src/ru/OInt/core/Modules/OPI_Telegram.os +++ b/src/ru/OInt/core/Modules/OPI_Telegram.os @@ -35,13 +35,12 @@ // BSLLS:UsingServiceTag-off // BSLLS:NumberOfParams-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс #Область ПолучениеДанныхИНастройка @@ -236,7 +235,7 @@ Хэш = ""; КлючДвоичные = ПолучитьДвоичныеДанныеИзСтроки(КлючСтрокой); - Результат = OPI_Криптография.HMACSHA(КлючДвоичные, ПолучитьДвоичныеДанныеИзСтроки(Токен), "SHA256"); + Результат = OPI_Криптография.HMAC(КлючДвоичные, ПолучитьДвоичныеДанныеИзСтроки(Токен), "SHA256"); ТЗнач = Новый ТаблицаЗначений; ТЗнач.Колонки.Добавить("Ключ"); diff --git a/src/ru/OInt/core/Modules/OPI_Twitter.os b/src/ru/OInt/core/Modules/OPI_Twitter.os index 0d22f99c7f..c2aa491bd0 100644 --- a/src/ru/OInt/core/Modules/OPI_Twitter.os +++ b/src/ru/OInt/core/Modules/OPI_Twitter.os @@ -35,14 +35,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс #Область ДанныеИНастройка diff --git a/src/ru/OInt/core/Modules/OPI_VK.os b/src/ru/OInt/core/Modules/OPI_VK.os index 24014bb3d1..20a58aa8e7 100644 --- a/src/ru/OInt/core/Modules/OPI_VK.os +++ b/src/ru/OInt/core/Modules/OPI_VK.os @@ -35,6 +35,7 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:UnusedLocalVariable-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check wrong-string-literal-content @@ -42,8 +43,6 @@ //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс #Область ПолучениеТокена diff --git a/src/ru/OInt/core/Modules/OPI_VKTeams.os b/src/ru/OInt/core/Modules/OPI_VKTeams.os index 60c575c789..a5a288d5f7 100644 --- a/src/ru/OInt/core/Modules/OPI_VKTeams.os +++ b/src/ru/OInt/core/Modules/OPI_VKTeams.os @@ -32,14 +32,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Область ПрограммныйИнтерфейс #Область ОбщиеМетоды diff --git a/src/ru/OInt/core/Modules/OPI_Viber.os b/src/ru/OInt/core/Modules/OPI_Viber.os index e8dc597e8f..b953a24daf 100644 --- a/src/ru/OInt/core/Modules/OPI_Viber.os +++ b/src/ru/OInt/core/Modules/OPI_Viber.os @@ -30,13 +30,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс #Область НастройкиИИнформация diff --git a/src/ru/OInt/core/Modules/OPI_YandexDisk.os b/src/ru/OInt/core/Modules/OPI_YandexDisk.os index 460e1230ea..500e517152 100644 --- a/src/ru/OInt/core/Modules/OPI_YandexDisk.os +++ b/src/ru/OInt/core/Modules/OPI_YandexDisk.os @@ -32,14 +32,13 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check method-too-many-params //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс #Область РаботаСФайламиИПапками diff --git a/src/ru/OInt/core/Modules/OPI_YandexID.os b/src/ru/OInt/core/Modules/OPI_YandexID.os index c50ad46492..6023a9c9a1 100644 --- a/src/ru/OInt/core/Modules/OPI_YandexID.os +++ b/src/ru/OInt/core/Modules/OPI_YandexID.os @@ -29,13 +29,12 @@ // BSLLS:LatinAndCyrillicSymbolInWord-off // BSLLS:IncorrectLineBreak-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content - - #Область ПрограммныйИнтерфейс // Получить код подтверждения diff --git a/src/ru/OInt/core/Modules/OPI_YandexMarket.os b/src/ru/OInt/core/Modules/OPI_YandexMarket.os index c2f111a1f6..0b8a5b0a8a 100644 --- a/src/ru/OInt/core/Modules/OPI_YandexMarket.os +++ b/src/ru/OInt/core/Modules/OPI_YandexMarket.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Область ПрограммныйИнтерфейс #Область КабинетыИМагазины diff --git a/src/ru/OInt/core/Modules/OPI_YandexMetrika.os b/src/ru/OInt/core/Modules/OPI_YandexMetrika.os index e813b81b8f..a42ac5a90a 100644 --- a/src/ru/OInt/core/Modules/OPI_YandexMetrika.os +++ b/src/ru/OInt/core/Modules/OPI_YandexMetrika.os @@ -33,14 +33,13 @@ // BSLLS:NumberOfOptionalParams-off // BSLLS:UsingServiceTag-off // BSLLS:LineLength-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions //@skip-check wrong-string-literal-content //@skip-check method-too-many-params - - #Область ПрограммныйИнтерфейс #Область УправлениеМетками diff --git a/src/ru/OInt/tests/Modules/internal/OPI_Тесты.os b/src/ru/OInt/tests/Modules/internal/OPI_Тесты.os index e8bbadcdef..b98573721c 100644 --- a/src/ru/OInt/tests/Modules/internal/OPI_Тесты.os +++ b/src/ru/OInt/tests/Modules/internal/OPI_Тесты.os @@ -44,6 +44,7 @@ // BSLLS:UnusedLocalMethod-off // BSLLS:NestedFunctionInParameters-off // BSLLS:MissingTemporaryFileDeletion-off +// BSLLS:UsingSynchronousCalls-off //@skip-check undefined-variable //@skip-check wrong-string-literal-content diff --git a/src/ru/OInt/tests/Modules/internal/OPI_ТестыCLI.os b/src/ru/OInt/tests/Modules/internal/OPI_ТестыCLI.os index 84c67eb1a7..5dcb865876 100644 --- a/src/ru/OInt/tests/Modules/internal/OPI_ТестыCLI.os +++ b/src/ru/OInt/tests/Modules/internal/OPI_ТестыCLI.os @@ -44,6 +44,7 @@ // BSLLS:UnusedLocalMethod-off // BSLLS:NestedFunctionInParameters-off // BSLLS:MissingTemporaryFileDeletion-off +// BSLLS:UsingSynchronousCalls-off //@skip-check undefined-variable //@skip-check wrong-string-literal-content diff --git a/src/ru/OInt/tools/Modules/OPI_ЗапросыHTTP.os b/src/ru/OInt/tools/Modules/OPI_ЗапросыHTTP.os index 2d901e4811..ad27983109 100644 --- a/src/ru/OInt/tools/Modules/OPI_ЗапросыHTTP.os +++ b/src/ru/OInt/tools/Modules/OPI_ЗапросыHTTP.os @@ -30,6 +30,7 @@ // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off // BSLLS:NumberOfOptionalParams-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-unused-local-variable //@skip-check method-too-many-params diff --git a/src/ru/OInt/tools/Modules/OPI_ЗапросыSQL.os b/src/ru/OInt/tools/Modules/OPI_ЗапросыSQL.os index 4913b21e8d..211bc013cc 100644 --- a/src/ru/OInt/tools/Modules/OPI_ЗапросыSQL.os +++ b/src/ru/OInt/tools/Modules/OPI_ЗапросыSQL.os @@ -33,6 +33,7 @@ // BSLLS:QueryParseError-off // BSLLS:AssignAliasFieldsInQuery-off // BSLLS:NumberOfParams-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions @@ -165,69 +166,14 @@ Если Не ЗначениеЗаполнено(КолонкиТаблицы) Тогда СтруктураРезультата = СоздатьТаблицу(Модуль, Таблица, СтруктураКолонок, Соединение, Tls); - Иначе - СоответствиеНахождения = Новый Соответствие; - ИмяПоля = Модуль.ПолучитьОсобенности()["ПолеКолонки"]; + Ошибка = НормализоватьТаблицу(Модуль, Таблица, СтруктураКолонок, КолонкиТаблицы, Соединение, Tls); - КодУдаления = 0; - КодДобавления = 1; - КодИгнорирования = 2; - - Для Каждого Колонка Из КолонкиТаблицы Цикл - - ИмяКолонки = Колонка[ИмяПоля]; - - Если Не ЗначениеЗаполнено(ИмяКолонки) Тогда - Продолжить; - Иначе - СоответствиеНахождения.Вставить(ИмяКолонки, КодУдаления); - КонецЕсли; - - КонецЦикла; - - Если СоответствиеНахождения.Количество() = 0 Тогда - СоответствиеОтвета = Новый Соответствие; - СоответствиеОтвета.Вставить("result", "false"); - СоответствиеОтвета.Вставить("error" , "Unsupported table schema type"); - Возврат СоответствиеОтвета; + Если Ошибка <> Неопределено Тогда + Возврат Ошибка; КонецЕсли; - Для Каждого НеобходимаяКолонка Из СтруктураКолонок Цикл - - ИмяКолонки = НеобходимаяКолонка.Ключ; - Существует = СоответствиеНахождения.Получить(ИмяКолонки) <> Неопределено; - Действие = ?(Существует, КодИгнорирования, КодДобавления); - - СоответствиеНахождения.Вставить(ИмяКолонки, Действие); - - КонецЦикла; - - Для Каждого ЧастьСхемы Из СоответствиеНахождения Цикл - - КодДействия = ЧастьСхемы.Значение; - ИмяКолонки = ЧастьСхемы.Ключ; - - Если КодДействия = 0 Тогда - - Результат = УдалитьКолонкуТаблицы(Модуль, Таблица, ИмяКолонки, Соединение, Tls); - - ИначеЕсли КодДействия = 1 Тогда - - ТипДанных = СтруктураКолонок[ИмяКолонки]; - Результат = ДобавитьКолонкуТаблицы(Модуль, Таблица, ИмяКолонки, ТипДанных, Соединение, Tls); - - Иначе - Продолжить; - КонецЕсли; - - Если Не Результат["result"] Тогда - ВызватьИсключение Результат["error"]; - КонецЕсли; - - КонецЦикла; - КонецЕсли; Завершение = Модуль.ВыполнитьЗапросSQL("COMMIT;", , , Соединение); @@ -1103,6 +1049,77 @@ КонецФункции +Функция НормализоватьТаблицу(Знач Модуль + , Знач Таблица + , Знач СтруктураКолонок + , КолонкиТаблицы + , Знач Соединение + , Знач Tls) + + СоответствиеНахождения = Новый Соответствие; + ИмяПоля = Модуль.ПолучитьОсобенности()["ПолеКолонки"]; + + КодУдаления = 0; + КодДобавления = 1; + КодИгнорирования = 2; + + Для Каждого Колонка Из КолонкиТаблицы Цикл + + ИмяКолонки = Колонка[ИмяПоля]; + + Если Не ЗначениеЗаполнено(ИмяКолонки) Тогда + Продолжить; + Иначе + СоответствиеНахождения.Вставить(ИмяКолонки, КодУдаления); + КонецЕсли; + + КонецЦикла; + + Если СоответствиеНахождения.Количество() = 0 Тогда + СоответствиеОтвета = Новый Соответствие; + СоответствиеОтвета.Вставить("result", "false"); + СоответствиеОтвета.Вставить("error" , "Unsupported table schema type"); + Возврат СоответствиеОтвета; + КонецЕсли; + + Для Каждого НеобходимаяКолонка Из СтруктураКолонок Цикл + + ИмяКолонки = НеобходимаяКолонка.Ключ; + Существует = СоответствиеНахождения.Получить(ИмяКолонки) <> Неопределено; + Действие = ?(Существует, КодИгнорирования, КодДобавления); + + СоответствиеНахождения.Вставить(ИмяКолонки, Действие); + + КонецЦикла; + + Для Каждого ЧастьСхемы Из СоответствиеНахождения Цикл + + КодДействия = ЧастьСхемы.Значение; + ИмяКолонки = ЧастьСхемы.Ключ; + + Если КодДействия = 0 Тогда + + Результат = УдалитьКолонкуТаблицы(Модуль, Таблица, ИмяКолонки, Соединение, Tls); + + ИначеЕсли КодДействия = 1 Тогда + + ТипДанных = СтруктураКолонок[ИмяКолонки]; + Результат = ДобавитьКолонкуТаблицы(Модуль, Таблица, ИмяКолонки, ТипДанных, Соединение, Tls); + + Иначе + Продолжить; + КонецЕсли; + + Если Не Результат["result"] Тогда + ВызватьИсключение Результат["error"]; + КонецЕсли; + + КонецЦикла; + + Возврат Неопределено; + +КонецФункции + Функция СформироватьТекстФильтра(Знач Фильтры) Если Не ЗначениеЗаполнено(Фильтры) Тогда diff --git a/src/ru/OInt/tools/Modules/OPI_Компоненты.os b/src/ru/OInt/tools/Modules/OPI_Компоненты.os index 2d7c2777f5..f797c261e0 100644 --- a/src/ru/OInt/tools/Modules/OPI_Компоненты.os +++ b/src/ru/OInt/tools/Modules/OPI_Компоненты.os @@ -34,6 +34,7 @@ // BSLLS:DuplicateStringLiteral-off // BSLLS:MagicNumber-off // BSLLS:UsingHardcodeNetworkAddress-off +// BSLLS:UsingSynchronousCalls-off //@skip-check use-non-recommended-method //@skip-check module-structure-top-region diff --git a/src/ru/OInt/tools/Modules/OPI_ПолучениеДанныхТестов.os b/src/ru/OInt/tools/Modules/OPI_ПолучениеДанныхТестов.os index a02cb3a6e7..2b38182426 100644 --- a/src/ru/OInt/tools/Modules/OPI_ПолучениеДанныхТестов.os +++ b/src/ru/OInt/tools/Modules/OPI_ПолучениеДанныхТестов.os @@ -34,6 +34,7 @@ // BSLLS:DuplicateStringLiteral-off // BSLLS:MagicNumber-off // BSLLS:UsingHardcodeNetworkAddress-off +// BSLLS:UsingSynchronousCalls-off //@skip-check use-non-recommended-method //@skip-check module-structure-top-region diff --git a/src/ru/OInt/tools/Modules/OPI_ПреобразованиеТипов.os b/src/ru/OInt/tools/Modules/OPI_ПреобразованиеТипов.os index 6107aec3d3..f27efb47d2 100644 --- a/src/ru/OInt/tools/Modules/OPI_ПреобразованиеТипов.os +++ b/src/ru/OInt/tools/Modules/OPI_ПреобразованиеТипов.os @@ -28,6 +28,7 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/ru/OInt/tools/Modules/internal/Modules/OPI_Инструменты.os b/src/ru/OInt/tools/Modules/internal/Modules/OPI_Инструменты.os index af8797917b..d887761aba 100644 --- a/src/ru/OInt/tools/Modules/internal/Modules/OPI_Инструменты.os +++ b/src/ru/OInt/tools/Modules/internal/Modules/OPI_Инструменты.os @@ -30,6 +30,7 @@ // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off // BSLLS:NumberOfOptionalParams-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-unused-local-variable //@skip-check method-too-many-params diff --git a/src/ru/OInt/tools/Modules/internal/Modules/OPI_Криптография.os b/src/ru/OInt/tools/Modules/internal/Modules/OPI_Криптография.os index 7e341af782..1e35b107f6 100644 --- a/src/ru/OInt/tools/Modules/internal/Modules/OPI_Криптография.os +++ b/src/ru/OInt/tools/Modules/internal/Modules/OPI_Криптография.os @@ -28,6 +28,7 @@ // BSLLS:IncorrectLineBreak-off // BSLLS:UnusedLocalVariable-off // BSLLS:UsingServiceTag-off +// BSLLS:UsingSynchronousCalls-off //@skip-check module-structure-top-region //@skip-check module-structure-method-in-regions diff --git a/src/ru/OPI/src/CommonModules/OPI_Telegram/Module.bsl b/src/ru/OPI/src/CommonModules/OPI_Telegram/Module.bsl index 599360f6a3..dc6ee75719 100644 --- a/src/ru/OPI/src/CommonModules/OPI_Telegram/Module.bsl +++ b/src/ru/OPI/src/CommonModules/OPI_Telegram/Module.bsl @@ -237,7 +237,7 @@ КлючДвоичные = ПолучитьДвоичныеДанныеИзСтроки(КлючСтрокой); Результат = OPI_Криптография.HMAC(КлючДвоичные, ПолучитьДвоичныеДанныеИзСтроки(Токен), "SHA256"); - + ТЗнач = Новый ТаблицаЗначений; ТЗнач.Колонки.Добавить("Ключ"); ТЗнач.Колонки.Добавить("Значение"); diff --git a/src/ru/OPI/src/CommonModules/OPI_ЗапросыSQL/Module.bsl b/src/ru/OPI/src/CommonModules/OPI_ЗапросыSQL/Module.bsl index a4e8da6fda..0d55494ba1 100644 --- a/src/ru/OPI/src/CommonModules/OPI_ЗапросыSQL/Module.bsl +++ b/src/ru/OPI/src/CommonModules/OPI_ЗапросыSQL/Module.bsl @@ -168,13 +168,13 @@ Если Не ЗначениеЗаполнено(КолонкиТаблицы) Тогда СтруктураРезультата = СоздатьТаблицу(Модуль, Таблица, СтруктураКолонок, Соединение, Tls); Иначе - + Ошибка = НормализоватьТаблицу(Модуль, Таблица, СтруктураКолонок, КолонкиТаблицы, Соединение, Tls); - + Если Ошибка <> Неопределено Тогда Возврат Ошибка; КонецЕсли; - + КонецЕсли; Завершение = Модуль.ВыполнитьЗапросSQL("COMMIT;", , , Соединение); @@ -1053,10 +1053,10 @@ Функция НормализоватьТаблицу(Знач Модуль , Знач Таблица , Знач СтруктураКолонок - , КолонкиТаблицы + , КолонкиТаблицы , Знач Соединение , Знач Tls) - + СоответствиеНахождения = Новый Соответствие; ИмяПоля = Модуль.ПолучитьОсобенности()["ПолеКолонки"]; @@ -1116,9 +1116,9 @@ КонецЕсли; КонецЦикла; - + Возврат Неопределено; - + КонецФункции Функция СформироватьТекстФильтра(Знач Фильтры) diff --git a/src/ru/cli/data/Classes/internal/Classes/tools.os b/src/ru/cli/data/Classes/internal/Classes/tools.os index 72f481503b..971bd4982d 100644 --- a/src/ru/cli/data/Classes/internal/Classes/tools.os +++ b/src/ru/cli/data/Classes/internal/Classes/tools.os @@ -82,7 +82,7 @@ | | - | Utils = ЗагрузитьСценарий(""C:/ProgramData/Jenkins/.jenkins/workspace/OpiSonar/src/ru/cli/tools/Modules/Utils.os"", Контекст); + | Utils = ЗагрузитьСценарий(""C:/ProgramData/Jenkins/.jenkins/workspace/OpiMain/src/ru/cli/tools/Modules/Utils.os"", Контекст); |" + Символы.ПС;