diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index ecee22590..47811d5b5 100644 --- a/clearing-parent/account-service/pom.xml +++ b/clearing-parent/account-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index a30c47209..73c5b3b67 100644 --- a/clearing-parent/backend-api/pom.xml +++ b/clearing-parent/backend-api/pom.xml @@ -11,7 +11,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json index 5522e8727..41dce2a2d 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1,6 +1,6 @@ { - "version": "3.20.260.139", + "version": "3.20.260.141", "enums": { @@ -1559,7 +1559,7 @@ ] } , - "residenceDictionary": { + "residence": { "name": "Справочник резидентства", @@ -1970,7 +1970,7 @@ } , {"code": "residence", - "type": 12,"dbname": "Код резиденции","name": "Резиденция","shortname": "Резиденция","searchable": true,"sortable": true,"visible": true,"link": "countryCode" + "type": 12,"dbname": "Код резиденции","name": "Резиденция","shortname": "Резиденция","searchable": true,"sortable": true,"visible": true,"link": "residence" } , {"code": "shortNameEng", @@ -2052,7 +2052,7 @@ } , {"code": "residence", - "type": 12,"name": "Резиденция","shortname": "Резиденция","link": "countryCode" + "type": 12,"name": "Резиденция","shortname": "Резиденция","link": "residence" } , {"code": "fullNameEng", @@ -4550,7 +4550,7 @@ } , {"code": "planBalance", - "type": 10,"name": "Плановый баланс","shortname": "Плановый баланс","searchable": true,"sortable": true,"visible": true,"ignore": true + "type": 10,"name": "Плановый баланс","shortname": "Плановый баланс","searchable": true,"sortable": true,"visible": true } , {"code": "balanceDimension", diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index 304b8b300..887875658 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1,6 +1,6 @@ - + @@ -344,11 +344,11 @@ - + - + @@ -440,7 +440,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -1056,7 +1056,7 @@ - + diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index 98bb36ad7..e5e869a5c 100644 --- a/clearing-parent/balance-service/pom.xml +++ b/clearing-parent/balance-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index a19fcf4e7..d5639ec8d 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index ca1fd9f75..6aec83939 100644 --- a/clearing-parent/cleaning-builders/pom.xml +++ b/clearing-parent/cleaning-builders/pom.xml @@ -6,13 +6,13 @@ ru.spcex.clearing clearing-parent - SPCEX-3.20.260 + SPCEX-3.20.261 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.20.260 + SPCEX-3.20.261 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.20.260 + SPCEX-3.20.261 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index 7a061f0aa..16f9da0af 100644 --- a/clearing-parent/clearing-service/pom.xml +++ b/clearing-parent/clearing-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index fce6a2fed..a3ceab572 100644 --- a/clearing-parent/clearing-validation/pom.xml +++ b/clearing-parent/clearing-validation/pom.xml @@ -8,12 +8,12 @@ clearing-validation Clearing-module, dependency version of platform-utils jar - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.20.260 + SPCEX-3.20.261 compile ru.spcex.clearing dictionary - SPCEX-3.20.260 + SPCEX-3.20.261 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 19d1990df..b754f260a 100644 --- a/clearing-parent/company-service/pom.xml +++ b/clearing-parent/company-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 4.0.0 diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java index 2c029714d..4fa70c837 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java @@ -1,10 +1,20 @@ package ru.spcex.clearing.company.config.validation; +import java.util.Map; +import java.util.function.Consumer; +import java.util.function.Function; import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.platform.dictionary.*; +import ru.clearing.platform.dictionary.AllowedDictionary; +import ru.clearing.platform.dictionary.CompanySymbolDictionary; +import ru.clearing.platform.dictionary.CorporationSoleTypeDictionary; +import ru.clearing.platform.dictionary.CountryCodeDictionary; +import ru.clearing.platform.dictionary.LegalKindDictionary; +import ru.clearing.platform.dictionary.OrganizationTypeDictionary; +import ru.clearing.platform.dictionary.ResidenceDictionary; +import ru.clearing.platform.dictionary.WorkflowStatusDictionary; import ru.spcex.clearing.company.error.CompanyErrors; import ru.spcex.clearing.company.validation.CompanySymbolNotExistRule; import ru.spcex.clearing.imdg.IMDGDistributedNames; @@ -12,7 +22,6 @@ import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteReques import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyInfoUpdateRequest; import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyNewRequest; import ru.spcex.clearing.validation.common.rules.DictionaryPresentRule; -import ru.spcex.clearing.validation.common.rules.EnumPresentRule; import ru.spcex.clearing.validation.common.rules.FieldRequiredRule; import ru.spcex.clearing.validation.common.rules.IdPresentRule; import ru.spcex.clearing.validation.common.rules.specific.IdPresentSpecificRule; @@ -24,10 +33,6 @@ import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.validation.IValidator; import ru.spcex.platform.utils.validation.ValidatorImpl; -import java.util.Map; -import java.util.function.Consumer; -import java.util.function.Function; - @Configuration public class CompanyValidationConfig { @@ -135,6 +140,7 @@ public class CompanyValidationConfig { addImdg.accept(IMDGDistributedNames.Map_LegalKindDictionary); addImdg.accept(IMDGDistributedNames.Map_LegalKindDictionary); addImdg.accept(IMDGDistributedNames.Map_OrganizationTypeDictionary); + addImdg.accept(IMDGDistributedNames.Map_ResidenceDictionary); return new ValidatorImpl<>(context, // FieldRequiredRule.instance("id", CommonDeleteRequest::getId, CompanyErrors.RequiredFieldEmpty), IdPresentRule.instance("id", @@ -152,13 +158,20 @@ public class CompanyValidationConfig { CorporationSoleTypeDictionary.class, CompanyErrors.RequiredFieldEmpty, CompanyErrors.DictionaryNotFound, false), - DictionaryPresentRule.instance("CountryCode", - CompanyInfoUpdateRequest::getCountryCode, + IdPresentRule.instance("CountryCodeId", + CompanyInfoUpdateRequest::getCountryCodeId, IMDGDistributedNames.Map_CountryCodeDictionary, CountryCodeDictionary.class, CompanyErrors.RequiredFieldEmpty, CompanyErrors.DictionaryNotFound, false), + DictionaryPresentRule.instance("CountryCode", + CompanyInfoUpdateRequest::getCountryCode, + IMDGDistributedNames.Map_CountryCodeDictionary, + CountryCodeDictionary.class, + CompanyErrors.RequiredFieldEmpty, + CompanyErrors.DictionaryNotFound, + false), DictionaryPresentRule.instance("ProfessionalSign", CompanyInfoUpdateRequest::getProfessionalSign, IMDGDistributedNames.Map_AllowedDictionary, @@ -182,8 +195,8 @@ public class CompanyValidationConfig { false), DictionaryPresentRule.instance("residence", CompanyInfoUpdateRequest::getResidence, - IMDGDistributedNames.Map_CountryCodeDictionary, - CountryCodeDictionary.class, + IMDGDistributedNames.Map_ResidenceDictionary, + ResidenceDictionary.class, CompanyErrors.RequiredFieldEmpty, CompanyErrors.DictionaryNotFound, false) diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ValidationConfig.java index 2849a138d..2dcbc91f6 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ValidationConfig.java @@ -57,6 +57,7 @@ public class ValidationConfig { addImdg.accept(IMDGDistributedNames.Map_SettlementHouseProperties, SettlementHouseProperties.class); addImdg.accept(IMDGDistributedNames.Map_CurrencyCodeDictionary, CurrencyCodeDictionary.class); + addImdg.accept(IMDGDistributedNames.Map_ResidenceDictionary, CurrencyCodeDictionary.class); return imdg; } diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java index fccbe1798..13b4362a5 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java @@ -1,5 +1,8 @@ package ru.spcex.clearing.company.service; +import java.time.Instant; +import java.util.Objects; +import java.util.function.Function; import org.apache.commons.lang3.StringUtils; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.producer.Producer; @@ -11,6 +14,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.profile.CompanyInfo; +import ru.clearing.platform.dictionary.CountryCodeDictionary; import ru.spcex.clearing.company.error.CompanyErrors; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; @@ -27,15 +31,12 @@ import ru.spcex.platform.imdg.api.ImdgTransaction; import ru.spcex.platform.utils.error.ValidationException; import ru.spcex.platform.utils.validation.IValidator; -import java.time.Instant; -import java.util.Objects; -import java.util.function.Function; - @Service public class CompanyInfoService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); private final ImdgProvider imdgProvider; private final Imdg companyMap; + private final Imdg countryCodeDictionaryImdg; protected final CompanyService companyService; private final RequestHelper requestHelper; private final ValidationHelper validationHelper; @@ -53,6 +54,7 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea this.companyService = companyService; this.imdgProvider = imdgProvider; this.companyMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); + this.countryCodeDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CountryCodeDictionary, CountryCodeDictionary.class); this.validationHelper = validationHelper; this.userRoleVerification = userRoleVerification; this.companyInfoUpdateRequestValidator = companyInfoUpdateRequestValidator; @@ -87,6 +89,7 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea log.trace("Company {} not found", req.getId()); return requestHelper.makeErrorResponse(companyInfoReq, CompanyErrors.CompanyNotFound, companyInfoReq.getId()); } + company.setUpdated(Instant.now()); if (StringUtils.isNotEmpty(req.getShortName())) company.setShortName(req.getShortName()); @@ -94,7 +97,12 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea company.setFullName(req.getFullName()); CompanyInfo companyInfo = company.getProfile(); - companyInfo.setCountryCode(req.getCountryCode()); + String countryCode = req.getCountryCode(); + if (req.getCountryCodeId() != null) { + CountryCodeDictionary countryCodeDictionary = countryCodeDictionaryImdg.getSingleObjectByID(req.getCountryCodeId()); + countryCode = countryCodeDictionary.getCode(); + } + companyInfo.setCountryCode(countryCode); companyInfo.setProfessionalSign(req.getProfessionalSign()); companyInfo.setLegalKind(req.getLegalKind()); companyInfo.setOrganizationType(req.getOrganizationType()); diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java index 62a0d4987..1940c22c2 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java @@ -255,6 +255,9 @@ public class CompanyService extends QueueConsumer implements InitializingBean { if (CompanySymbol.RGRC.equalsByKey(companySymbol.getCompanySymbol())) { company.setRegistrationCode(setUpValue); } + if (CompanySymbol.TAXN.equalsByKey(companySymbol.getCompanySymbol())) { + company.getProfile().setTaxNumber(setUpValue); + } } private String shouldBeDeletedOrSet(String companySymbol, boolean shouldBeDeleted) { diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java index 3d3cc40e0..73e80d91d 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java @@ -1,6 +1,9 @@ package ru.spcex.clearing.company.service; +import java.util.Objects; +import java.util.Optional; +import java.util.function.Function; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.producer.Producer; import org.slf4j.Logger; @@ -20,7 +23,6 @@ import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolNewR import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolUpdateRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; -import ru.spcex.clearing.platform.messaging.service.Status; import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.util.services.RequestHelper; import ru.spcex.clearing.validation.common.ValidationHelper; @@ -34,10 +36,6 @@ import ru.spcex.platform.utils.error.ClearingBaseException; import ru.spcex.platform.utils.error.ValidationException; import ru.spcex.platform.utils.validation.IValidator; -import java.util.Objects; -import java.util.Optional; -import java.util.function.Function; - @Service public class CompanySymbolService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -113,10 +111,12 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB public Long create(CompanySymbolNewRequest symbolRequest) throws ValidationException { log.debug("CompanySymbolNewRequest received"); { // validate - IValidator validator = companySymbolNewRequestValidator.apply(symbolRequest); - Optional error = validator.tillFirstError(); - if (error.isPresent()) { - throw new ValidationException(error.get()); + if (!symbolRequest.getCompanySymbol().equals("TAXN")) { + IValidator validator = companySymbolNewRequestValidator.apply(symbolRequest); + Optional error = validator.tillFirstError(); + if (error.isPresent()) { + throw new ValidationException(error.get()); + } } } @@ -139,7 +139,9 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB boolean txOk = false; try { Imdg companySymbolsTMap = transaction.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); - companySymbolsTMap.update(newSymbol); + if (!newSymbol.getCompanySymbol().equals("TAXN")) { + companySymbolsTMap.update(newSymbol); + } Imdg companyMap = transaction.getImdg(IMDGDistributedNames.Map_Company, Company.class); Company company = companyMap.getSingleObjectByID(newSymbol.getCompanyId()); @@ -163,8 +165,10 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(symbolRequest); if (requestInfoUpdate != null) return requestInfoUpdate; - requestInfoUpdate = validationHelper.validateTillFirstError(symbolRequest, companySymbolUpdateRequestValidator); - if (requestInfoUpdate != null) return requestInfoUpdate; + if (!req.getCompanySymbol().equals("TAXN")) { + requestInfoUpdate = validationHelper.validateTillFirstError(symbolRequest, companySymbolUpdateRequestValidator); + if (requestInfoUpdate != null) return requestInfoUpdate; + } } CompanySymbols companySymbols; ImdgTransaction transaction = imdgProvider.newTransaction(); @@ -183,7 +187,9 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB companySymbols.setCompanySymbol(req.getCompanySymbol()); } companySymbols.setCompanySymbolValue(req.getCompanySymbolValue()); - companySymbolsTMap.update(companySymbols); + if (!companySymbols.getCompanySymbol().equals("TAXN")) { + companySymbolsTMap.update(companySymbols); + } companyService.updateCompanyBySymbol(transaction, companySymbols, false); txOk = true; } catch (ClearingBaseException e) { diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java index 22dc30751..d9c6792c7 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java @@ -162,15 +162,19 @@ public class MultiCompanyService } for (CompanySymbolNewRequest partRequest : req.getCompanySymbols()) { - CompanySymbols existSymbol = findCompanySymbols(partRequest); - if (existSymbol == null) { - log.trace("For company[{}] do new companySymbol", companyId); - Long id = companySymbolService.create(partRequest); - } else { - log.trace("For company[{}] do update companySymbol[{}]", companyId, existSymbol.getId()); - CompanySymbolUpdateRequest partUpdateRequest = createUpdateRequest(existSymbol, partRequest); - replyI = companySymbolService.companySymbolUpdate(wrapRequest(baseRequest, partUpdateRequest, ActionType.UPDATE)); - validateReply(companyId, "companySymbolUpdate", replyI); + try { + CompanySymbols existSymbol = findCompanySymbols(partRequest); + if (existSymbol == null) { + log.trace("For company[{}] do new companySymbol", companyId); + Long id = companySymbolService.create(partRequest); + } else { + log.trace("For company[{}] do update companySymbol[{}]", companyId, existSymbol.getId()); + CompanySymbolUpdateRequest partUpdateRequest = createUpdateRequest(existSymbol, partRequest); + replyI = companySymbolService.companySymbolUpdate(wrapRequest(baseRequest, partUpdateRequest, ActionType.UPDATE)); + validateReply(companyId, "companySymbolUpdate", replyI); + } + } catch (ValidationException e) { + log.warn("Skip creating/updating CompanySymbol cause: {}", e.getMessage()); } } for (ContactNewRequest partRequest : req.getContacts()) { diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index 1ca22fbf2..737adca37 100644 --- a/clearing-parent/db-scripts/pom.xml +++ b/clearing-parent/db-scripts/pom.xml @@ -7,12 +7,12 @@ db-scripts db-scripts db-scripts for PostgreSQL - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql index cf64d05d2..301e79af6 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -4247,7 +4247,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF05 TO clearing; -- sDf06 - ДФ-06 Запрос на зачисление/списание денежных средств DROP TABLE IF EXISTS S_DF06; -CREATE TABLE S_DF06(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(255), DEAL varchar(10), CLIENT_N varchar(255), INN varchar(255), BIC varchar(255), SPEC varchar(255), NUMBER numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, DOC_NUM varchar(3), DOC_DATE varchar(8), PAY_VAL varchar(12), MESSAGE_ID varchar(128), PARENT_ID varchar(128)); +CREATE TABLE S_DF06(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(255), DEAL varchar(10), CLIENT_N varchar(255), INN varchar(255), BIC varchar(255), SPEC varchar(255), NUMBER numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, DOC_NUM varchar(6), DOC_DATE varchar(8), PAY_VAL varchar(12), MESSAGE_ID varchar(128), PARENT_ID varchar(128)); COMMENT ON TABLE S_DF06 IS 'ДФ-06 Запрос на зачисление/списание денежных средств'; COMMENT ON COLUMN S_DF06.ID IS 'Идентификатор записи'; @@ -4292,7 +4292,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF06 TO clearing; -- sDf07 - ДФ-07 Ответ на запрос по зачислению/списанию денежных средств DROP TABLE IF EXISTS S_DF07; -CREATE TABLE S_DF07(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(255), DEAL varchar(10), CLIENT_N varchar(255), INN varchar(255), BIC varchar(255), SPEC varchar(255), NUMBER numeric(72,18), RESULT numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF_ID bigint, DOC_NUM varchar(3), DOC_DATE varchar(8), PAY_VAL varchar(12), MESSAGE_ID varchar(128), PARENT_ID varchar(128)); +CREATE TABLE S_DF07(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(255), DEAL varchar(10), CLIENT_N varchar(255), INN varchar(255), BIC varchar(255), SPEC varchar(255), NUMBER numeric(72,18), RESULT numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF_ID bigint, DOC_NUM varchar(6), DOC_DATE varchar(8), PAY_VAL varchar(12), MESSAGE_ID varchar(128), PARENT_ID varchar(128)); COMMENT ON TABLE S_DF07 IS 'ДФ-07 Ответ на запрос по зачислению/списанию денежных средств'; COMMENT ON COLUMN S_DF07.ID IS 'Идентификатор записи'; @@ -4729,7 +4729,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF53 TO clearing; -- sDf54 - ДФ-54 Вывод свободных средств для инициаторов категории В с клирингового счета 30414 DROP TABLE IF EXISTS S_DF54; -CREATE TABLE S_DF54(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar(4), DOCNM_REF varchar(16), DOCNMPREV varchar(16), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), OP_ORDER varchar(1), PAY_DATE varchar(8), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR_1 varchar(35), SPECIF_1 varchar(255), SEND_TYPE varchar(10), DOC_RESULT varchar(2), GENERATION_TIME timestamp, GENERATION_ID bigint, DOC_NUM varchar(3), DOC_DATE varchar(8), VALUE_DATE varchar(8), SWIFT_BEN varchar(11), SWIFT_INT varchar(11), MESSAGE_ID varchar(128), PARENT_ID varchar(128)); +CREATE TABLE S_DF54(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar(4), DOCNM_REF varchar(16), DOCNMPREV varchar(16), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), OP_ORDER varchar(1), PAY_DATE varchar(8), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR_1 varchar(35), SPECIF_1 varchar(255), SEND_TYPE varchar(10), DOC_RESULT varchar(2), GENERATION_TIME timestamp, GENERATION_ID bigint, DOC_NUM varchar(6), DOC_DATE varchar(8), VALUE_DATE varchar(8), SWIFT_BEN varchar(11), SWIFT_INT varchar(11), MESSAGE_ID varchar(128), PARENT_ID varchar(128)); COMMENT ON TABLE S_DF54 IS 'ДФ-54 Вывод свободных средств для инициаторов категории В с клирингового счета 30414'; COMMENT ON COLUMN S_DF54.ID IS 'Идентификатор записи'; @@ -4836,7 +4836,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF54 TO clearing; -- sDf55 - ДФ-55 Квитанция об обработке ДФ-54 DROP TABLE IF EXISTS S_DF55; -CREATE TABLE S_DF55(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar(4), DOCNM_REF varchar(16), DOCNMPREV varchar(16), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), OP_ORDER varchar(1), PAY_DATE varchar(8), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR_1 varchar(35), SPECIF_1 varchar(255), SEND_TYPE varchar(10), DOC_RESULT varchar(2), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, DOC_NUM varchar(3), DOC_DATE varchar(8), VALUE_DATE varchar(8), SWIFT_BEN varchar(11), SWIFT_INT varchar(11), MESSAGE_ID varchar(128), PARENT_ID varchar(128)); +CREATE TABLE S_DF55(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar(4), DOCNM_REF varchar(16), DOCNMPREV varchar(16), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), OP_ORDER varchar(1), PAY_DATE varchar(8), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR_1 varchar(35), SPECIF_1 varchar(255), SEND_TYPE varchar(10), DOC_RESULT varchar(2), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, DOC_NUM varchar(6), DOC_DATE varchar(8), VALUE_DATE varchar(8), SWIFT_BEN varchar(11), SWIFT_INT varchar(11), MESSAGE_ID varchar(128), PARENT_ID varchar(128)); COMMENT ON TABLE S_DF55 IS 'ДФ-55 Квитанция об обработке ДФ-54'; COMMENT ON COLUMN S_DF55.ID IS 'Идентификатор записи'; @@ -4972,7 +4972,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF56 TO clearing; -- sDf57 - ДФ-57 Список транзакций о списании/зачислении за период по всем счетам (ТБС и КС) DROP TABLE IF EXISTS S_DF57; -CREATE TABLE S_DF57(GENERATION_TIME timestamp, ID bigint PRIMARY KEY, DBF_ID bigint, DEAL_DEB varchar(4), DEAL_CRED varchar(4), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(35), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), PAY_DATE varchar(8), EXT_DATE varchar(255), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR varchar(35), SPECIF varchar(255), FILE_NAME varchar(255), GENERATION_ID bigint, DOC_NUM varchar(3), DOC_DATE varchar(8), DT_IN varchar(22), KT_IN varchar(22), DT_OUT varchar(22), KT_OUT varchar(22), MESSAGE_ID varchar(128), PARENT_ID varchar(128)); +CREATE TABLE S_DF57(GENERATION_TIME timestamp, ID bigint PRIMARY KEY, DBF_ID bigint, DEAL_DEB varchar(4), DEAL_CRED varchar(4), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(35), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), OP_TYPE varchar(2), PAY_DATE varchar(8), EXT_DATE varchar(255), PAY_VAL varchar(12), SUM_DEB varchar(22), SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), ACC_KR varchar(35), SPECIF varchar(255), FILE_NAME varchar(255), GENERATION_ID bigint, DOC_NUM varchar(6), DOC_DATE varchar(8), DT_IN varchar(22), KT_IN varchar(22), DT_OUT varchar(22), KT_OUT varchar(22), MESSAGE_ID varchar(128), PARENT_ID varchar(128)); COMMENT ON TABLE S_DF57 IS 'ДФ-57 Список транзакций о списании/зачислении за период по всем счетам (ТБС и КС)'; COMMENT ON COLUMN S_DF57.GENERATION_TIME IS 'Дата и время создания записи'; diff --git a/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql b/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql index b3fa786c8..1e9005809 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql @@ -10,260 +10,260 @@ INSERT INTO WORKFLOW_STATUS_DICTIONARY(ID, CODE, NAME) values (2, 'BLKD', 'Не INSERT INTO WORKFLOW_STATUS_DICTIONARY(ID, CODE, NAME) values (3, 'PAUS', 'Приостановлен') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (1, 'RUS', 'РОССИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (2, 'AFG', 'АФГАНИСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (3, 'ALB', 'АЛБАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (4, 'ATA', 'АНТАРКТИДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (5, 'DZA', 'АЛЖИР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (6, 'ASM', 'АМЕРИКАНСКОЕ САМОА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (7, 'AND', 'АНДОРРА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (8, 'AGO', 'АНГОЛА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (9, 'ATG', 'АНТИГУА И БАРБУДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (10, 'AZE', 'АЗЕРБАЙДЖАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (11, 'ARG', 'АРГЕНТИНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (12, 'AUS', 'АВСТРАЛИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (13, 'AUT', 'АВСТРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (14, 'BHS', 'БАГАМЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (15, 'BHR', 'БАХРЕЙН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (16, 'BGD', 'БАНГЛАДЕШ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (17, 'ARM', 'АРМЕНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (18, 'BRB', 'БАРБАДОС') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (19, 'BEL', 'БЕЛЬГИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (20, 'BMU', 'БЕРМУДЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (21, 'BTN', 'БУТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (22, 'BOL', 'БОЛИВИЯ, МНОГОНАЦИОНАЛЬНОЕ ГОСУДАРСТВО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (23, 'BIH', 'БОСНИЯ И ГЕРЦЕГОВИНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (24, 'BWA', 'БОТСВАНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (25, 'BVT', 'ОСТРОВ БУВЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (26, 'BRA', 'БРАЗИЛИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (27, 'BLZ', 'БЕЛИЗ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (28, 'IOT', 'БРИТАНСКАЯ ТЕРРИТОРИЯ В ИНДИЙСКОМ ОКЕАНЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (29, 'SLB', 'СОЛОМОНОВЫ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (30, 'VGB', 'ВИРГИНСКИЕ ОСТРОВА (БРИТАНСКИЕ)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (31, 'BRN', 'БРУНЕЙ-ДАРУССАЛАМ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (32, 'BGR', 'БОЛГАРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (33, 'MMR', 'МЬЯНМА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (34, 'BDI', 'БУРУНДИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (35, 'BLR', 'БЕЛАРУСЬ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (36, 'KHM', 'КАМБОДЖА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (37, 'CMR', 'КАМЕРУН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (38, 'CAN', 'КАНАДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (39, 'CPV', 'КАБО-ВЕРДЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (40, 'CYM', 'ОСТРОВА КАЙМАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (41, 'CAF', 'ЦЕНТРАЛЬНО-АФРИКАНСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (42, 'LKA', 'ШРИ-ЛАНКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (43, 'TCD', 'ЧАД') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (44, 'CHL', 'ЧИЛИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (45, 'CHN', 'КИТАЙ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (46, 'TWN', 'ТАЙВАНЬ (КИТАЙ)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (47, 'CXR', 'ОСТРОВ РОЖДЕСТВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (48, 'CCK', 'КОКОСОВЫЕ (КИЛИНГ) ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (49, 'COL', 'КОЛУМБИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (50, 'COM', 'КОМОРЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (51, 'MYT', 'МАЙОТТА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (52, 'COG', 'КОНГО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (53, 'COD', 'КОНГО, ДЕМОКРАТИЧЕСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (54, 'COK', 'ОСТРОВА КУКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (55, 'CRI', 'КОСТА-РИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (56, 'HRV', 'ХОРВАТИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (57, 'CUB', 'КУБА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (58, 'CYP', 'КИПР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (59, 'CZE', 'ЧЕХИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (60, 'BEN', 'БЕНИН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (61, 'DNK', 'ДАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (62, 'DMA', 'ДОМИНИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (63, 'DOM', 'ДОМИНИКАНСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (64, 'ECU', 'ЭКВАДОР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (65, 'SLV', 'ЭЛЬ-САЛЬВАДОР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (66, 'GNQ', 'ЭКВАТОРИАЛЬНАЯ ГВИНЕЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (67, 'ETH', 'ЭФИОПИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (68, 'ERI', 'ЭРИТРЕЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (69, 'EST', 'ЭСТОНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (70, 'FRO', 'ФАРЕРСКИЕ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (71, 'FLK', 'ФОЛКЛЕНДСКИЕ ОСТРОВА (МАЛЬВИНСКИЕ)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (72, 'SGS', 'ЮЖНАЯ ДЖОРДЖИЯ И ЮЖНЫЕ САНДВИЧЕВЫ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (73, 'FJI', 'ФИДЖИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (74, 'FIN', 'ФИНЛЯНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (75, 'ALA', 'АЛАНДСКИЕ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (76, 'FRA', 'ФРАНЦИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (77, 'GUF', 'ФРАНЦУЗСКАЯ ГВИАНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (78, 'PYF', 'ФРАНЦУЗСКАЯ ПОЛИНЕЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (79, 'ATF', 'ФРАНЦУЗСКИЕ ЮЖНЫЕ ТЕРРИТОРИИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (80, 'DJI', 'ДЖИБУТИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (81, 'GAB', 'ГАБОН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (82, 'GEO', 'ГРУЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (83, 'GMB', 'ГАМБИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (84, 'PSE', 'ПАЛЕСТИНА, ГОСУДАРСТВО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (85, 'DEU', 'ГЕРМАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (86, 'GHA', 'ГАНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (87, 'GIB', 'ГИБРАЛТАР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (88, 'KIR', 'КИРИБАТИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (89, 'GRC', 'ГРЕЦИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (90, 'GRL', 'ГРЕНЛАНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (91, 'GRD', 'ГРЕНАДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (92, 'GLP', 'ГВАДЕЛУПА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (93, 'GUM', 'ГУАМ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (94, 'GTM', 'ГВАТЕМАЛА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (95, 'GIN', 'ГВИНЕЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (96, 'GUY', 'ГАЙАНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (97, 'HTI', 'ГАИТИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (98, 'HMD', 'ОСТРОВ ХЕРД И ОСТРОВА МАКДОНАЛЬД') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (99, 'VAT', 'ПАПСКИЙ ПРЕСТОЛ (ГОСУДАРСТВО - ГОРОД ВАТИКАН)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (100, 'HND', 'ГОНДУРАС') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (101, 'HKG', 'ГОНКОНГ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (102, 'HUN', 'ВЕНГРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (103, 'ISL', 'ИСЛАНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (104, 'IND', 'ИНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (105, 'IDN', 'ИНДОНЕЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (106, 'IRN', 'ИРАН (ИСЛАМСКАЯ РЕСПУБЛИКА)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (107, 'IRQ', 'ИРАК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (108, 'IRL', 'ИРЛАНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (109, 'ISR', 'ИЗРАИЛЬ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (110, 'ITA', 'ИТАЛИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (111, 'CIV', 'КОТ Д''ИВУАР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (112, 'JAM', 'ЯМАЙКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (113, 'JPN', 'ЯПОНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (114, 'KAZ', 'КАЗАХСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (115, 'JOR', 'ИОРДАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (116, 'KEN', 'КЕНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (117, 'PRK', 'КОРЕЯ, НАРОДНО-ДЕМОКРАТИЧЕСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (118, 'KOR', 'КОРЕЯ, РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (119, 'KWT', 'КУВЕЙТ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (120, 'KGZ', 'КИРГИЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (121, 'LAO', 'ЛАОССКАЯ НАРОДНО-ДЕМОКРАТИЧЕСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (122, 'LBN', 'ЛИВАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (123, 'LSO', 'ЛЕСОТО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (124, 'LVA', 'ЛАТВИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (125, 'LBR', 'ЛИБЕРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (126, 'LBY', 'ЛИВИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (127, 'LIE', 'ЛИХТЕНШТЕЙН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (128, 'LTU', 'ЛИТВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (129, 'LUX', 'ЛЮКСЕМБУРГ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (130, 'MAC', 'МАКАО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (131, 'MDG', 'МАДАГАСКАР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (132, 'MWI', 'МАЛАВИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (133, 'MYS', 'МАЛАЙЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (134, 'MDV', 'МАЛЬДИВЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (135, 'MLI', 'МАЛИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (136, 'MLT', 'МАЛЬТА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (137, 'MTQ', 'МАРТИНИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (138, 'MRT', 'МАВРИТАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (139, 'MUS', 'МАВРИКИЙ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (140, 'MEX', 'МЕКСИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (141, 'MCO', 'МОНАКО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (142, 'MNG', 'МОНГОЛИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (143, 'MDA', 'МОЛДОВА, РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (144, 'MNE', 'ЧЕРНОГОРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (145, 'MSR', 'МОНТСЕРРАТ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (146, 'MAR', 'МАРОККО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (147, 'MOZ', 'МОЗАМБИК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (148, 'OMN', 'ОМАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (149, 'NAM', 'НАМИБИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (150, 'NRU', 'НАУРУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (151, 'NPL', 'НЕПАЛ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (152, 'NLD', 'НИДЕРЛАНДЫ, КОРОЛЕВСТВО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (153, 'CUW', 'КЮРАСАО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (154, 'ABW', 'АРУБА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (155, 'SXM', 'СЕН-МАРТЕН (нидерландская часть)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (156, 'BES', 'БОНЭЙР, СИНТ-ЭСТАТИУС И САБА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (157, 'NCL', 'НОВАЯ КАЛЕДОНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (158, 'VUT', 'ВАНУАТУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (159, 'NZL', 'НОВАЯ ЗЕЛАНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (160, 'NIC', 'НИКАРАГУА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (161, 'NER', 'НИГЕР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (162, 'NGA', 'НИГЕРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (163, 'NIU', 'НИУЭ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (164, 'NFK', 'ОСТРОВ НОРФОЛК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (165, 'NOR', 'НОРВЕГИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (166, 'MNP', 'СЕВЕРНЫЕ МАРИАНСКИЕ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (167, 'UMI', 'МАЛЫЕ ТИХООКЕАНСКИЕ ОТДАЛЕННЫЕ ОСТРОВА СОЕДИНЕННЫХ ШТАТОВ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (168, 'FSM', 'МИКРОНЕЗИЯ, ФЕДЕРАТИВНЫЕ ШТАТЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (169, 'MHL', 'МАРШАЛЛОВЫ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (170, 'PLW', 'ПАЛАУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (171, 'PAK', 'ПАКИСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (172, 'PAN', 'ПАНАМА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (173, 'PNG', 'ПАПУА-НОВАЯ ГВИНЕЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (174, 'PRY', 'ПАРАГВАЙ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (175, 'PER', 'ПЕРУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (176, 'PHL', 'ФИЛИППИНЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (177, 'PCN', 'ПИТКЕРН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (178, 'POL', 'ПОЛЬША') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (179, 'PRT', 'ПОРТУГАЛИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (180, 'GNB', 'ГВИНЕЯ-БИСАУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (181, 'TLS', 'ТИМОР-ЛЕСТЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (182, 'PRI', 'ПУЭРТО-РИКО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (183, 'QAT', 'КАТАР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (184, 'REU', 'РЕЮНЬОН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (185, 'ROU', 'РУМЫНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (186, 'RWA', 'РУАНДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (187, 'BLM', 'СЕН-БАРТЕЛЕМИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (188, 'SHN', 'СВЯТАЯ ЕЛЕНА, ОСТРОВ ВОЗНЕСЕНИЯ, ТРИСТАН-ДА-КУНЬЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (189, 'KNA', 'СЕНТ-КИТС И НЕВИС') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (190, 'AIA', 'АНГИЛЬЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (191, 'LCA', 'СЕНТ-ЛЮСИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (192, 'MAF', '"СЕН-МАРТЕН (французская часть)"') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (193, 'SPM', 'СЕН-ПЬЕР И МИКЕЛОН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (194, 'VCT', 'СЕНТ-ВИНСЕНТ И ГРЕНАДИНЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (195, 'SMR', 'САН-МАРИНО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (196, 'STP', 'САН-ТОМЕ И ПРИНСИПИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (197, 'SAU', 'САУДОВСКАЯ АРАВИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (198, 'SEN', 'СЕНЕГАЛ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (199, 'SRB', 'СЕРБИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (200, 'SYC', 'СЕЙШЕЛЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (201, 'SLE', 'СЬЕРРА-ЛЕОНЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (202, 'SGP', 'СИНГАПУР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (203, 'SVK', 'СЛОВАКИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (204, 'VNM', 'ВЬЕТНАМ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (205, 'SVN', 'СЛОВЕНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (206, 'SOM', 'СОМАЛИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (207, 'ZAF', 'ЮЖНАЯ АФРИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (208, 'ZWE', 'ЗИМБАБВЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (209, 'ESP', 'ИСПАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (210, 'SSD', 'ЮЖНЫЙ СУДАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (211, 'SDN', 'СУДАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (212, 'ESH', 'ЗАПАДНАЯ САХАРА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (213, 'SUR', 'СУРИНАМ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (214, 'SJM', 'ШПИЦБЕРГЕН И ЯН МАЙЕН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (215, 'SWZ', 'ЭСВАТИНИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (216, 'SWE', 'ШВЕЦИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (217, 'CHE', 'ШВЕЙЦАРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (218, 'SYR', 'СИРИЙСКАЯ АРАБСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (219, 'TJK', 'ТАДЖИКИСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (220, 'THA', 'ТАИЛАНД') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (221, 'TGO', 'ТОГО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (222, 'TKL', 'ТОКЕЛАУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (223, 'TON', 'ТОНГА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (224, 'TTO', 'ТРИНИДАД И ТОБАГО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (225, 'ARE', 'ОБЪЕДИНЕННЫЕ АРАБСКИЕ ЭМИРАТЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (226, 'TUN', 'ТУНИС') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (227, 'TUR', 'ТУРЦИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (228, 'TKM', 'ТУРКМЕНИСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (229, 'TCA', 'ОСТРОВА ТЕРКС И КАЙКОС') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (230, 'TUV', 'ТУВАЛУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (231, 'UGA', 'УГАНДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (232, 'UKR', 'УКРАИНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (233, 'MKD', 'СЕВЕРНАЯ МАКЕДОНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (234, 'EGY', 'ЕГИПЕТ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (235, 'GBR', 'СОЕДИНЕННОЕ КОРОЛЕВСТВО ВЕЛИКОБРИТАНИИ И СЕВЕРНОЙ ИРЛАНДИИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (236, 'GGY', 'ГЕРНСИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (237, 'JEY', 'ДЖЕРСИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (238, 'IMN', 'ОСТРОВ МЭН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (239, 'TZA', 'ТАНЗАНИЯ, ОБЪЕДИНЕННАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (240, 'USA', 'СОЕДИНЕННЫЕ ШТАТЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (241, 'VIR', 'ВИРГИНСКИЕ ОСТРОВА (США)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (242, 'BFA', 'БУРКИНА-ФАСО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (243, 'URY', 'УРУГВАЙ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (244, 'UZB', 'УЗБЕКИСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (245, 'VEN', 'ВЕНЕСУЭЛА, БОЛИВАРИАНСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (246, 'WLF', 'УОЛЛИС И ФУТУНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (247, 'WSM', 'САМОА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (248, 'YEM', 'ЙЕМЕН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (249, 'ZMB', 'ЗАМБИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (250, 'ABH', 'АБХАЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (251, 'OST', 'ЮЖНАЯ ОСЕТИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (252, 'DNR', 'ДНР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (253, 'LNR', 'ЛНР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (254, '998', 'Международная организация') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (4, 'AFG', 'АФГАНИСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (8, 'ALB', 'АЛБАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (10, 'ATA', 'АНТАРКТИДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (12, 'DZA', 'АЛЖИР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (16, 'ASM', 'АМЕРИКАНСКОЕ САМОА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (20, 'AND', 'АНДОРРА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (24, 'AGO', 'АНГОЛА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (28, 'ATG', 'АНТИГУА И БАРБУДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (31, 'AZE', 'АЗЕРБАЙДЖАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (32, 'ARG', 'АРГЕНТИНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (36, 'AUS', 'АВСТРАЛИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (40, 'AUT', 'АВСТРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (44, 'BHS', 'БАГАМЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (48, 'BHR', 'БАХРЕЙН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (50, 'BGD', 'БАНГЛАДЕШ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (51, 'ARM', 'АРМЕНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (52, 'BRB', 'БАРБАДОС') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (56, 'BEL', 'БЕЛЬГИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (60, 'BMU', 'БЕРМУДЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (64, 'BTN', 'БУТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (68, 'BOL', 'БОЛИВИЯ, МНОГОНАЦИОНАЛЬНОЕ ГОСУДАРСТВО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (70, 'BIH', 'БОСНИЯ И ГЕРЦЕГОВИНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (72, 'BWA', 'БОТСВАНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (74, 'BVT', 'ОСТРОВ БУВЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (76, 'BRA', 'БРАЗИЛИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (84, 'BLZ', 'БЕЛИЗ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (86, 'IOT', 'БРИТАНСКАЯ ТЕРРИТОРИЯ В ИНДИЙСКОМ ОКЕАНЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (90, 'SLB', 'СОЛОМОНОВЫ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (92, 'VGB', 'ВИРГИНСКИЕ ОСТРОВА (БРИТАНСКИЕ)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (96, 'BRN', 'БРУНЕЙ-ДАРУССАЛАМ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (100, 'BGR', 'БОЛГАРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (104, 'MMR', 'МЬЯНМА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (108, 'BDI', 'БУРУНДИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (112, 'BLR', 'БЕЛАРУСЬ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (116, 'KHM', 'КАМБОДЖА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (120, 'CMR', 'КАМЕРУН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (124, 'CAN', 'КАНАДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (132, 'CPV', 'КАБО-ВЕРДЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (136, 'CYM', 'ОСТРОВА КАЙМАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (140, 'CAF', 'ЦЕНТРАЛЬНО-АФРИКАНСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (144, 'LKA', 'ШРИ-ЛАНКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (148, 'TCD', 'ЧАД') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (152, 'CHL', 'ЧИЛИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (156, 'CHN', 'КИТАЙ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (158, 'TWN', 'ТАЙВАНЬ (КИТАЙ)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (162, 'CXR', 'ОСТРОВ РОЖДЕСТВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (166, 'CCK', 'КОКОСОВЫЕ (КИЛИНГ) ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (170, 'COL', 'КОЛУМБИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (174, 'COM', 'КОМОРЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (175, 'MYT', 'МАЙОТТА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (178, 'COG', 'КОНГО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (180, 'COD', 'КОНГО, ДЕМОКРАТИЧЕСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (184, 'COK', 'ОСТРОВА КУКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (188, 'CRI', 'КОСТА-РИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (191, 'HRV', 'ХОРВАТИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (192, 'CUB', 'КУБА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (196, 'CYP', 'КИПР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (203, 'CZE', 'ЧЕХИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (204, 'BEN', 'БЕНИН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (208, 'DNK', 'ДАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (212, 'DMA', 'ДОМИНИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (214, 'DOM', 'ДОМИНИКАНСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (218, 'ECU', 'ЭКВАДОР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (222, 'SLV', 'ЭЛЬ-САЛЬВАДОР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (226, 'GNQ', 'ЭКВАТОРИАЛЬНАЯ ГВИНЕЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (231, 'ETH', 'ЭФИОПИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (232, 'ERI', 'ЭРИТРЕЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (233, 'EST', 'ЭСТОНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (234, 'FRO', 'ФАРЕРСКИЕ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (238, 'FLK', 'ФОЛКЛЕНДСКИЕ ОСТРОВА (МАЛЬВИНСКИЕ)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (239, 'SGS', 'ЮЖНАЯ ДЖОРДЖИЯ И ЮЖНЫЕ САНДВИЧЕВЫ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (242, 'FJI', 'ФИДЖИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (246, 'FIN', 'ФИНЛЯНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (248, 'ALA', 'АЛАНДСКИЕ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (250, 'FRA', 'ФРАНЦИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (254, 'GUF', 'ФРАНЦУЗСКАЯ ГВИАНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (258, 'PYF', 'ФРАНЦУЗСКАЯ ПОЛИНЕЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (260, 'ATF', 'ФРАНЦУЗСКИЕ ЮЖНЫЕ ТЕРРИТОРИИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (262, 'DJI', 'ДЖИБУТИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (266, 'GAB', 'ГАБОН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (268, 'GEO', 'ГРУЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (270, 'GMB', 'ГАМБИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (275, 'PSE', 'ПАЛЕСТИНА, ГОСУДАРСТВО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (276, 'DEU', 'ГЕРМАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (288, 'GHA', 'ГАНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (292, 'GIB', 'ГИБРАЛТАР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (296, 'KIR', 'КИРИБАТИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (300, 'GRC', 'ГРЕЦИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (304, 'GRL', 'ГРЕНЛАНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (308, 'GRD', 'ГРЕНАДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (312, 'GLP', 'ГВАДЕЛУПА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (316, 'GUM', 'ГУАМ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (320, 'GTM', 'ГВАТЕМАЛА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (324, 'GIN', 'ГВИНЕЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (328, 'GUY', 'ГАЙАНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (332, 'HTI', 'ГАИТИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (334, 'HMD', 'ОСТРОВ ХЕРД И ОСТРОВА МАКДОНАЛЬД') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (336, 'VAT', 'ПАПСКИЙ ПРЕСТОЛ (ГОСУДАРСТВО - ГОРОД ВАТИКАН)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (340, 'HND', 'ГОНДУРАС') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (344, 'HKG', 'ГОНКОНГ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (348, 'HUN', 'ВЕНГРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (352, 'ISL', 'ИСЛАНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (356, 'IND', 'ИНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (360, 'IDN', 'ИНДОНЕЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (364, 'IRN', 'ИРАН (ИСЛАМСКАЯ РЕСПУБЛИКА)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (368, 'IRQ', 'ИРАК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (372, 'IRL', 'ИРЛАНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (376, 'ISR', 'ИЗРАИЛЬ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (380, 'ITA', 'ИТАЛИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (384, 'CIV', 'КОТ Д''ИВУАР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (388, 'JAM', 'ЯМАЙКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (392, 'JPN', 'ЯПОНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (398, 'KAZ', 'КАЗАХСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (400, 'JOR', 'ИОРДАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (404, 'KEN', 'КЕНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (408, 'PRK', 'КОРЕЯ, НАРОДНО-ДЕМОКРАТИЧЕСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (410, 'KOR', 'КОРЕЯ, РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (414, 'KWT', 'КУВЕЙТ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (417, 'KGZ', 'КИРГИЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (418, 'LAO', 'ЛАОССКАЯ НАРОДНО-ДЕМОКРАТИЧЕСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (422, 'LBN', 'ЛИВАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (426, 'LSO', 'ЛЕСОТО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (428, 'LVA', 'ЛАТВИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (430, 'LBR', 'ЛИБЕРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (434, 'LBY', 'ЛИВИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (438, 'LIE', 'ЛИХТЕНШТЕЙН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (440, 'LTU', 'ЛИТВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (442, 'LUX', 'ЛЮКСЕМБУРГ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (446, 'MAC', 'МАКАО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (450, 'MDG', 'МАДАГАСКАР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (454, 'MWI', 'МАЛАВИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (458, 'MYS', 'МАЛАЙЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (462, 'MDV', 'МАЛЬДИВЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (466, 'MLI', 'МАЛИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (470, 'MLT', 'МАЛЬТА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (474, 'MTQ', 'МАРТИНИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (478, 'MRT', 'МАВРИТАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (480, 'MUS', 'МАВРИКИЙ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (484, 'MEX', 'МЕКСИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (492, 'MCO', 'МОНАКО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (496, 'MNG', 'МОНГОЛИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (498, 'MDA', 'МОЛДОВА, РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (499, 'MNE', 'ЧЕРНОГОРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (500, 'MSR', 'МОНТСЕРРАТ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (504, 'MAR', 'МАРОККО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (508, 'MOZ', 'МОЗАМБИК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (512, 'OMN', 'ОМАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (516, 'NAM', 'НАМИБИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (520, 'NRU', 'НАУРУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (524, 'NPL', 'НЕПАЛ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (528, 'NLD', 'НИДЕРЛАНДЫ, КОРОЛЕВСТВО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (531, 'CUW', 'КЮРАСАО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (533, 'ABW', 'АРУБА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (534, 'SXM', 'СЕН-МАРТЕН (нидерландская часть)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (535, 'BES', 'БОНЭЙР, СИНТ-ЭСТАТИУС И САБА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (540, 'NCL', 'НОВАЯ КАЛЕДОНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (548, 'VUT', 'ВАНУАТУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (554, 'NZL', 'НОВАЯ ЗЕЛАНДИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (558, 'NIC', 'НИКАРАГУА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (562, 'NER', 'НИГЕР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (566, 'NGA', 'НИГЕРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (570, 'NIU', 'НИУЭ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (574, 'NFK', 'ОСТРОВ НОРФОЛК') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (578, 'NOR', 'НОРВЕГИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (580, 'MNP', 'СЕВЕРНЫЕ МАРИАНСКИЕ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (581, 'UMI', 'МАЛЫЕ ТИХООКЕАНСКИЕ ОТДАЛЕННЫЕ ОСТРОВА СОЕДИНЕННЫХ ШТАТОВ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (583, 'FSM', 'МИКРОНЕЗИЯ, ФЕДЕРАТИВНЫЕ ШТАТЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (584, 'MHL', 'МАРШАЛЛОВЫ ОСТРОВА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (585, 'PLW', 'ПАЛАУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (586, 'PAK', 'ПАКИСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (591, 'PAN', 'ПАНАМА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (598, 'PNG', 'ПАПУА-НОВАЯ ГВИНЕЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (600, 'PRY', 'ПАРАГВАЙ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (604, 'PER', 'ПЕРУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (608, 'PHL', 'ФИЛИППИНЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (612, 'PCN', 'ПИТКЕРН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (616, 'POL', 'ПОЛЬША') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (620, 'PRT', 'ПОРТУГАЛИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (624, 'GNB', 'ГВИНЕЯ-БИСАУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (626, 'TLS', 'ТИМОР-ЛЕСТЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (630, 'PRI', 'ПУЭРТО-РИКО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (634, 'QAT', 'КАТАР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (638, 'REU', 'РЕЮНЬОН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (642, 'ROU', 'РУМЫНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (643, 'RUS', 'РОССИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (646, 'RWA', 'РУАНДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (652, 'BLM', 'СЕН-БАРТЕЛЕМИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (654, 'SHN', 'СВЯТАЯ ЕЛЕНА, ОСТРОВ ВОЗНЕСЕНИЯ, ТРИСТАН-ДА-КУНЬЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (659, 'KNA', 'СЕНТ-КИТС И НЕВИС') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (660, 'AIA', 'АНГИЛЬЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (662, 'LCA', 'СЕНТ-ЛЮСИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (663, 'MAF', '"СЕН-МАРТЕН (французская часть)"') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (666, 'SPM', 'СЕН-ПЬЕР И МИКЕЛОН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (670, 'VCT', 'СЕНТ-ВИНСЕНТ И ГРЕНАДИНЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (674, 'SMR', 'САН-МАРИНО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (678, 'STP', 'САН-ТОМЕ И ПРИНСИПИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (682, 'SAU', 'САУДОВСКАЯ АРАВИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (686, 'SEN', 'СЕНЕГАЛ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (688, 'SRB', 'СЕРБИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (690, 'SYC', 'СЕЙШЕЛЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (694, 'SLE', 'СЬЕРРА-ЛЕОНЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (702, 'SGP', 'СИНГАПУР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (703, 'SVK', 'СЛОВАКИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (704, 'VNM', 'ВЬЕТНАМ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (705, 'SVN', 'СЛОВЕНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (706, 'SOM', 'СОМАЛИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (710, 'ZAF', 'ЮЖНАЯ АФРИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (716, 'ZWE', 'ЗИМБАБВЕ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (724, 'ESP', 'ИСПАНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (728, 'SSD', 'ЮЖНЫЙ СУДАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (729, 'SDN', 'СУДАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (732, 'ESH', 'ЗАПАДНАЯ САХАРА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (740, 'SUR', 'СУРИНАМ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (744, 'SJM', 'ШПИЦБЕРГЕН И ЯН МАЙЕН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (748, 'SWZ', 'ЭСВАТИНИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (752, 'SWE', 'ШВЕЦИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (756, 'CHE', 'ШВЕЙЦАРИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (760, 'SYR', 'СИРИЙСКАЯ АРАБСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (762, 'TJK', 'ТАДЖИКИСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (764, 'THA', 'ТАИЛАНД') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (768, 'TGO', 'ТОГО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (772, 'TKL', 'ТОКЕЛАУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (776, 'TON', 'ТОНГА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (780, 'TTO', 'ТРИНИДАД И ТОБАГО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (784, 'ARE', 'ОБЪЕДИНЕННЫЕ АРАБСКИЕ ЭМИРАТЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (788, 'TUN', 'ТУНИС') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (792, 'TUR', 'ТУРЦИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (795, 'TKM', 'ТУРКМЕНИСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (796, 'TCA', 'ОСТРОВА ТЕРКС И КАЙКОС') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (798, 'TUV', 'ТУВАЛУ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (800, 'UGA', 'УГАНДА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (804, 'UKR', 'УКРАИНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (807, 'MKD', 'СЕВЕРНАЯ МАКЕДОНИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (818, 'EGY', 'ЕГИПЕТ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (826, 'GBR', 'СОЕДИНЕННОЕ КОРОЛЕВСТВО ВЕЛИКОБРИТАНИИ И СЕВЕРНОЙ ИРЛАНДИИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (831, 'GGY', 'ГЕРНСИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (832, 'JEY', 'ДЖЕРСИ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (833, 'IMN', 'ОСТРОВ МЭН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (834, 'TZA', 'ТАНЗАНИЯ, ОБЪЕДИНЕННАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (840, 'USA', 'СОЕДИНЕННЫЕ ШТАТЫ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (850, 'VIR', 'ВИРГИНСКИЕ ОСТРОВА (США)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (854, 'BFA', 'БУРКИНА-ФАСО') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (858, 'URY', 'УРУГВАЙ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (860, 'UZB', 'УЗБЕКИСТАН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (862, 'VEN', 'ВЕНЕСУЭЛА, БОЛИВАРИАНСКАЯ РЕСПУБЛИКА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (876, 'WLF', 'УОЛЛИС И ФУТУНА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (882, 'WSM', 'САМОА') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (887, 'YEM', 'ЙЕМЕН') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (894, 'ZMB', 'ЗАМБИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (895, 'ABH', 'АБХАЗИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (896, 'OST', 'ЮЖНАЯ ОСЕТИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (897, 'DNR', 'ДНР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (898, 'LNR', 'ЛНР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO COUNTRY_CODE_DICTIONARY(ID, CODE, NAME) values (998, '998', 'МЕЖДУНАРОДНАЯ ОРГАНИЗАЦИЯ') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO SECTION_DICTIONARY(ID, CODE, NAME) values (1, 'MKR', 'Секция Денежного рынка МКР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; @@ -426,9 +426,8 @@ INSERT INTO COMPANY_SYMBOL_DICTIONARY(ID, CODE, NAME, SHORTNAME) values (19, 'LI INSERT INTO COMPANY_SYMBOL_DICTIONARY(ID, CODE, NAME, SHORTNAME) values (20, 'INTC', 'Код инициатора', 'Код инициатора') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, SHORTNAME = EXCLUDED.SHORTNAME; INSERT INTO COMPANY_SYMBOL_DICTIONARY(ID, CODE, NAME, SHORTNAME) values (21, 'CRCD', 'Атрибут участника «Кросс - код»', 'Кросс код') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, SHORTNAME = EXCLUDED.SHORTNAME; -INSERT INTO COMPANY_SYMBOL_DICTIONARY(ID, CODE, NAME, SHORTNAME) values (22, 'PLEI', 'Идентификатор в рамках процесса получения LEI', 'Код Pre-LEI') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, SHORTNAME = EXCLUDED.SHORTNAME; -INSERT INTO COMPANY_SYMBOL_DICTIONARY(ID, CODE, NAME, SHORTNAME) values (23, 'LEI', 'Идентификатор юридических лиц на глобальном уровне', 'Код LEI') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, SHORTNAME = EXCLUDED.SHORTNAME; -INSERT INTO COMPANY_SYMBOL_DICTIONARY(ID, CODE, NAME, SHORTNAME) values (24, 'SWT', 'Идентификатор для обработки международных платежей', 'Код SWIFT') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, SHORTNAME = EXCLUDED.SHORTNAME; +INSERT INTO COMPANY_SYMBOL_DICTIONARY(ID, CODE, NAME, SHORTNAME) values (22, 'LEI', 'Идентификатор юридических лиц на глобальном уровне', 'pre-LEI/LEI') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, SHORTNAME = EXCLUDED.SHORTNAME; +INSERT INTO COMPANY_SYMBOL_DICTIONARY(ID, CODE, NAME, SHORTNAME) values (23, 'SWT', 'Идентификатор для обработки международных платежей', 'SWIFT') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME, SHORTNAME = EXCLUDED.SHORTNAME; INSERT INTO COMPANY_ROLE_DICTIONARY(ID, CODE, NAME) values (1, 'RPRT', 'Отчетная организация') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.19.1.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.19.1.sql new file mode 100644 index 000000000..2d561f789 --- /dev/null +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.19.1.sql @@ -0,0 +1,7 @@ +-- DB version: 3.19 -> 3.19.1 + +ALTER TABLE S_DF07 ALTER COLUMN doc_num TYPE varchar(6); +ALTER TABLE S_DF06 ALTER COLUMN doc_num TYPE varchar(6); +ALTER TABLE S_DF54 ALTER COLUMN doc_num TYPE varchar(6); +ALTER TABLE S_DF55 ALTER COLUMN doc_num TYPE varchar(6); +ALTER TABLE S_DF57 ALTER COLUMN doc_num TYPE varchar(6); diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.20.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.20.sql index a1f6ceb26..fde0a9632 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.20.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.20.sql @@ -16,5 +16,6 @@ ALTER TABLE COMPANY_INFO ADD COLUMN IF NOT EXISTS REGISTRATION_DATE DATE; COMMENT ON COLUMN COMPANY_INFO.TAX_NUMBER IS 'Налоговый номер в стране регистрации'; COMMENT ON COLUMN COMPANY_INFO.REGISTRATION_DATE IS 'Дата государственной регистрации'; +truncate country_code_dictionary; INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.20') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION; \ No newline at end of file diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 2be5dba8c..b51518480 100644 --- a/clearing-parent/dbf-exporter/pom.xml +++ b/clearing-parent/dbf-exporter/pom.xml @@ -7,12 +7,12 @@ dbf-exporter dbf-exporter DBF exporter for DBF files - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 2a14c4b03..8f4b07cde 100644 --- a/clearing-parent/dbf-importer/pom.xml +++ b/clearing-parent/dbf-importer/pom.xml @@ -8,12 +8,12 @@ dbf-importer dbf-importer DBF loader for DBF files - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index f9818fc2c..209e7856e 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index 96f04913b..4dec7f26f 100644 --- a/clearing-parent/extdb-importer/pom.xml +++ b/clearing-parent/extdb-importer/pom.xml @@ -4,12 +4,12 @@ ru.spcex.clearing clearing-parent - SPCEX-3.20.260 + SPCEX-3.20.261 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.20.260 + SPCEX-3.20.261 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index 2592c03a9..07245ff05 100644 --- a/clearing-parent/gateway-api/pom.xml +++ b/clearing-parent/gateway-api/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 4.0.0 diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java index 6810e5766..e77461afe 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java @@ -245,7 +245,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean { Map content = new HashMap<>(); reportRequest.getReports().forEach(reportPart -> makeContentByReportRequest(content, reportPart)); OutboundRequest outboundRequest = OutboundRequestBuilder.builder() - .section(reportType == ReportType.REPORT_KS_VALUE ? Section.CURR.getKey() : Section.FOND.getKey()) + .section(reportType == ReportType.REPORT_KS_VALUE_OUTER ? Section.CURR.getKey() : Section.FOND.getKey()) .type(reportType.getKey()) .clearingSystem(clearingSystemValue) .content(content).build(); diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java index 2a2bf1707..6ec2e0833 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java @@ -44,11 +44,21 @@ public class CompanyRequestAdapter { public CompanyInfoUpdateRequest toCompanyInfoRequest(CompanyInfo companyInfo) { CompanyInfoUpdateRequest companyInfoUpdateRequest = new CompanyInfoUpdateRequest(); - companyInfoUpdateRequest.setCountryCode("RUS"); // todo в текущей версии ТЗ присылается в цифровом обозначении + Long counterCodeId = Long.valueOf(companyInfo.getCountryCode()); + companyInfoUpdateRequest.setCountryCodeId(counterCodeId); companyInfoUpdateRequest.setProfessionalSign(companyInfo.getProfessionalSign()); companyInfoUpdateRequest.setLegalKind(companyInfo.getLegalKind()); companyInfoUpdateRequest.setOrganizationType(companyInfo.getOrganizationType()); - companyInfoUpdateRequest.setResidence(companyInfo.getResidence()); + + String residence; + if (counterCodeId == 643L) { + residence = "RUS"; + } else if (counterCodeId == 998L) { + residence = "WRLD"; + } else { + residence = "XTRN"; + } + companyInfoUpdateRequest.setResidence(residence); return companyInfoUpdateRequest; } diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index 954fa1ed1..0b2e0f4ed 100644 --- a/clearing-parent/imdg-hist/pom.xml +++ b/clearing-parent/imdg-hist/pom.xml @@ -5,12 +5,12 @@ 4.0.0 imdg-hist jar - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.20.260 + SPCEX-3.20.261 compile ru.spcex.clearing dictionary - SPCEX-3.20.260 + SPCEX-3.20.261 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.20.260 + SPCEX-3.20.261 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index 8a810f15e..75f77003f 100644 --- a/clearing-parent/imdg/pom.xml +++ b/clearing-parent/imdg/pom.xml @@ -7,12 +7,12 @@ imdg Clearing in memory data grid jar - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.20.260 + SPCEX-3.20.261 compile ru.spcex.clearing dictionary - SPCEX-3.20.260 + SPCEX-3.20.261 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.20.260 + SPCEX-3.20.261 compile diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java index 980680214..f21b477c7 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java @@ -81,7 +81,7 @@ public class CompanyHistoryMapStore extends BusinessEventMapStore { } } batchInsertUpdate(insertStatement, batchArgs); - batchInsertUpdate(insertCompanyInfoStatement, batchCompanyInfoArgs); + batchInsertUpdate(insertCompanyInfoStatement, batchCompanyInfoArgs, "COMPANY_INFO", getFieldsForCompanyInfo()); } diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index b8e4033ec..786f77083 100644 --- a/clearing-parent/lim-exporter/pom.xml +++ b/clearing-parent/lim-exporter/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lim-exporter Lim exporter - SPCEX-3.20.260 + SPCEX-3.20.261 jar ru.spcex.clearing clearing-parent - SPCEX-3.20.260 + SPCEX-3.20.261 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.20.260 + SPCEX-3.20.261 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 328741772..ce9874f4b 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.20.260 + SPCEX-3.20.261 clearing ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index f23dbf1e6..eaf2ae121 100644 --- a/clearing-parent/registry-service/pom.xml +++ b/clearing-parent/registry-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index d0a4aaadf..df0631070 100644 --- a/clearing-parent/reports-service/pom.xml +++ b/clearing-parent/reports-service/pom.xml @@ -8,12 +8,12 @@ reports-service reports-service Service for creating reports - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java index a22c770e5..239111945 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java @@ -346,7 +346,7 @@ public class ReportService extends QueueConsumerV2 implements InitializingBean { Map outFiles = createReportsForTask(List.of(), reportBuildersForGREC.values()); - sendReportsToGateway(List.of(), outFiles, ReportType.REPORT_KS_LCC.getKey()); + sendReportsToGateway(List.of(), outFiles, ReportType.REPORT_KS_OUTER.getKey()); sendFilesToSftp(outFiles.keySet()); } catch (Exception e) { log.error("Unexpected exception", e); @@ -364,7 +364,7 @@ public class ReportService extends QueueConsumerV2 implements InitializingBean { Map outFiles = createReportsForTask(List.of(), reportBuildersForCX84.values()); - sendReportsToGateway(List.of(), outFiles, ReportType.REPORT_KS_VALUE.getKey()); + sendReportsToGateway(List.of(), outFiles, ReportType.REPORT_KS_VALUE_OUTER.getKey()); sendFilesToSftp(outFiles.keySet()); } catch (Exception e) { log.error("Unexpected exception", e); diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 3a0eb3777..d85f8fa4c 100644 --- a/clearing-parent/scheduler-service/pom.xml +++ b/clearing-parent/scheduler-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.20.260 + SPCEX-3.20.261 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index 4a1e0c933..08b8277e5 100644 --- a/clearing-parent/securities-service/pom.xml +++ b/clearing-parent/securities-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index e4fcf3d04..bc4a20187 100644 --- a/clearing-parent/security-util/pom.xml +++ b/clearing-parent/security-util/pom.xml @@ -8,12 +8,12 @@ security-util clearing Clearing misc util for verify user roles jar - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.20.260 + SPCEX-3.20.261 compile ru.spcex.clearing dictionary - SPCEX-3.20.260 + SPCEX-3.20.261 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index 1a4a176e6..141d397b0 100644 --- a/clearing-parent/swt-exporter/pom.xml +++ b/clearing-parent/swt-exporter/pom.xml @@ -3,13 +3,13 @@ 4.0.0 swt-exporter Swt exporter - SPCEX-3.20.260 + SPCEX-3.20.261 jar ru.spcex.clearing clearing-parent - SPCEX-3.20.260 + SPCEX-3.20.261 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.20.260 + SPCEX-3.20.261 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 43876709d..d9d39638b 100644 --- a/clearing-parent/swt-importer/pom.xml +++ b/clearing-parent/swt-importer/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index 9c058d6e4..8ea9b56c6 100644 --- a/clearing-parent/test-clearing/pom.xml +++ b/clearing-parent/test-clearing/pom.xml @@ -4,11 +4,11 @@ ru.spcex.clearing clearing-parent - SPCEX-3.20.260 + SPCEX-3.20.261 test-clearing Test-clearing - SPCEX-3.20.260 + SPCEX-3.20.261 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index 637427c6d..5a2bf67cd 100644 --- a/clearing-parent/trade-importer/pom.xml +++ b/clearing-parent/trade-importer/pom.xml @@ -4,12 +4,12 @@ ru.spcex.clearing clearing-parent - SPCEX-3.20.260 + SPCEX-3.20.261 trade-importer trade-importer Trade importer module - SPCEX-3.20.260 + SPCEX-3.20.261 jar @@ -55,7 +55,7 @@ ru.spcex.clearing classes - SPCEX-3.20.260 + SPCEX-3.20.261 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index 653f7a54f..02f285f69 100644 --- a/clearing-parent/utility-service/pom.xml +++ b/clearing-parent/utility-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 4.0.0 diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml index 5b76f685b..773878ca6 100644 --- a/clearing-parent/xml-exporter/pom.xml +++ b/clearing-parent/xml-exporter/pom.xml @@ -7,12 +7,12 @@ xml-exporter xml-exporter XML exporter for XML files - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml index f395089a9..61d2b6865 100644 --- a/clearing-parent/xml-importer/pom.xml +++ b/clearing-parent/xml-importer/pom.xml @@ -8,12 +8,12 @@ xml-importer xml-importer XML loader for XML files - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CompanySymbol.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CompanySymbol.java index 3e044cea7..acdc8b815 100644 --- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CompanySymbol.java +++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/CompanySymbol.java @@ -21,6 +21,8 @@ public enum CompanySymbol implements IEnumKey { LICT("LICT"), LICC("LICC"), LICF("LICF"), + TAXN("TAXN"), + ; private final String key; diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportType.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportType.java index a8ed91402..ad7723c4f 100644 --- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportType.java +++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportType.java @@ -11,8 +11,8 @@ public enum ReportType implements IEnumKey { PFX65("PFX65"), REPORT_KS_TMP("REPORT_KS_TMP"), REPORT_KS_FINAL("REPORT_KS_FINAL"), - REPORT_KS_LCC("REPORT_KS_LCC"), - REPORT_KS_VALUE("REPORT_KS_VALUE"), + REPORT_KS_VALUE_OUTER("REPORT_KS_VALUE_OUTER"), + REPORT_KS_OUTER("REPORT_KS_OUTER"), ; diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java index b465ec317..307a27bd3 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java @@ -16,6 +16,8 @@ public class CompanyInfoUpdateRequest { @JsonProperty private String countryCode; @JsonProperty + private Long countryCodeId; + @JsonProperty private String description; @JsonProperty private String professionalSign; @@ -66,6 +68,14 @@ public class CompanyInfoUpdateRequest { this.countryCode = countryCode; } + public Long getCountryCodeId() { + return countryCodeId; + } + + public void setCountryCodeId(Long countryCodeId) { + this.countryCodeId = countryCodeId; + } + public String getDescription() { return description; } diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index c887daf05..b95153c32 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.20.260 + SPCEX-3.20.261 diff --git a/pom.xml b/pom.xml index 0faaa2591..686994d72 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.20.260 + SPCEX-3.20.261 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.20.260 + SPCEX-3.20.261 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index b4d6ed213..31508132c 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.20.260 + SPCEX-3.20.261 4.0.0