diff --git a/v1/resources/instance.cfc b/v1/resources/instance.cfc index 714b056..af97c1d 100644 --- a/v1/resources/instance.cfc +++ b/v1/resources/instance.cfc @@ -1,11 +1,8 @@ - - - @@ -14,9 +11,7 @@ - - select @@ -36,7 +31,6 @@ v.svc v.code v.man - e.updater_id u.login as updater_login @@ -71,7 +65,6 @@ AND a.is_enabled) where r.resource_realm_type_id=v.resource_realm_type_id) as resource_realm_cnt - from instance e left outer join specification_item i on (e.specification_item_id=i.specification_item_id) @@ -94,16 +87,13 @@ where e.instance_uid= AND s.specification_id= - - - select @@ -113,7 +103,6 @@ to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_state st.is_test st.instance_operation_uid::text as instance_operation_uid - st.instance_data->>'out' as out st.instance_data->>'params' as params st.instance_data->>'vault' as vault @@ -125,13 +114,8 @@ order by st.version desc limit 1 - - - - - @@ -171,11 +155,7 @@ - - (select io.operation from instance_operation io where io.instance_uid=e.instance_uid order by dt_submit desc limit 1) as current_operation ---> - select @@ -204,17 +184,12 @@ order by so.svc_operation_id - - - - - select @@ -240,7 +215,6 @@ left outer join svc_operation so on (o.operation=so.operation AND e.service_id=so.svc_id) left outer join svc_operation_cfs_param sop on (so.svc_operation_id=sop.svc_operation_id AND p.param=sop.svc_operation_cfs_param) left outer join svc s on (sop.ref_svc_id=s.svc_id) - join instance r on (p.param_value=r.instance_uid::text) left outer join specification_item si on (r.specification_item_id=si.specification_item_id) left outer join specification sp on (si.specification_id=sp.specification_id) @@ -250,7 +224,6 @@ AND sop.ref_svc_id > 0 order by sop.sort, p.param - @@ -289,14 +262,10 @@ where i.instance_uid= ) - - - - select p.svc_operation_cfs_param @@ -320,7 +289,6 @@ where svc.svc_id= AND o.operation='create' - @@ -333,7 +301,7 @@ - + @@ -341,70 +309,42 @@ - - + - - - - - - - - - - - - - - - - - - - - - - @@ -416,42 +356,28 @@ ,display_name= - ,descr= where instance_uid=; --select @@rowcount as cnt; - - - - - - - - - select count(*) as cnt from instance e @@ -465,7 +391,6 @@ "Instance is not accessible for the current user (possibly does not belong to the default specification)") ).withStatus(404)/> - select count(*) as cnt @@ -479,7 +404,6 @@ "Operation already started", "Instance deletion disabled when operation is started") ).withStatus(422)/> - select count(*) as cnt from instance_state st @@ -491,7 +415,6 @@ "Instance has a state", "Instance deletion disabled when having state") ).withStatus(422)/> - delete from instance_state @@ -501,26 +424,18 @@ delete from instance where instance_uid=; - - - - - - - - - \ No newline at end of file + diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc index d5866b6..124deb0 100644 --- a/v1/resources/instance_ls.cfc +++ b/v1/resources/instance_ls.cfc @@ -1,10 +1,8 @@ - - } /> - - @@ -57,21 +53,17 @@ - - - - + - - - - @@ -120,12 +109,10 @@ - - - v.svc v.code v.resource_realm_type_id - e.updater_id u.login as updater_login u.shortname as updater_shortname io.operation as last_operation io.instance_operation_uid::text as last_operation_uid io.submit_result as submit_result - coalesce((io.dt_start IS NOT NULL AND io.dt_finish IS NULL AND io.submit_result='201'),false) as operation_is_in_progress coalesce((io.dt_start IS NULL AND io.submit_result='201'),false) as operation_is_pending - to_char(io.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as operation_dt_start to_char(io.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as operation_dt_finish round(extract('epoch' from coalesce(io.dt_finish,CURRENT_TIMESTAMP)- io.dt_start),1) as duration - case when io.operation IN ('delete', 'suspend') AND io.is_successful then 0 /*null*/ when io.is_successful then extract('epoch' from CURRENT_TIMESTAMP - coalesce(io.dt_finish,CURRENT_TIMESTAMP)) else 0 end as uptime - to_char(io.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_deploy - + st.instance_state_uid::text as instance_state_uid st.is_test as is_test coalesce(st.instance_data->>'isDeleted','false') as is_deleted @@ -185,8 +166,6 @@ st.instance_data->'out'->'monitoring'->>'resourceMetrics' as monitoring_url st.instance_data->'params'->>'resourceRealm' as resource_realm to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_state - (case when st.instance_uid IS NULL then 'not created' when job_is_pending = 'true' then 'pending' @@ -198,8 +177,6 @@ ) as explained_status st.version - - select count(*) as cnt from ( @@ -242,10 +219,6 @@ ) inr where 1=1 - - - - select #local.fieldsToOutput#* @@ -273,23 +246,19 @@ on (e.instance_uid=io.instance_uid) where s.specification_id= - AND ( (e.display_name) ilike () OR ((coalesce(v.svc,'') ||' '|| coalesce(v.svc_short,'') ||' '|| coalesce(v.synonyms,''))) ilike () ) - ) inr where 1=1 - + order by limit #arguments.pageSize# offset #arguments.pageSize*(arguments.page-1)# - - select count(*) as cnt from instance e @@ -298,7 +267,6 @@ join contract d on (s.contract_id=d.contract_id) join contragent k on (d.contragent_id=k.contragent_id) join svc v on (e.service_id=v.svc_id) - left outer join (select ist.instance_state_uid, ist.instance_uid, ist.version, ist.dt_state, ist.is_test ,(ist.instance_data->>'isSuspended') as is_suspended ,(ist.instance_data->>'isDeleted') as is_deleted @@ -310,52 +278,37 @@ from instance_operation o join (select instance_uid, max(dt_submit) as dt_submit from instance_operation group by 1) lastv on (o.instance_uid=lastv.instance_uid AND o.dt_submit=lastv.dt_submit) ) io on (e.instance_uid=io.instance_uid) - where s.specification_id= - - - - > - - - - - - - - @@ -365,16 +318,11 @@ - - - - - insert into specification_item @@ -392,7 +340,6 @@ , ) returning specification_item_id; - insert into instance (instance_uid, display_name, service_id, specification_item_id, descr, dt_created, creator_id, dt_updated, updater_id) @@ -409,28 +356,21 @@ , ); - - - - - - - @@ -454,20 +394,16 @@ - - - select coalesce(svc_short,svc) as svc_short from svc where svc_id= - select display_name from instance e @@ -480,7 +416,6 @@ AND lower(e.display_name) like lower() AND service_id= - @@ -491,54 +426,6 @@ - - - - \ No newline at end of file diff --git a/v1/resources/instance_operation_cfs_param.cfc b/v1/resources/instance_operation_cfs_param.cfc index 4a4eb78..9a0f64b 100644 --- a/v1/resources/instance_operation_cfs_param.cfc +++ b/v1/resources/instance_operation_cfs_param.cfc @@ -4,25 +4,21 @@ Но: мы не хотели бы менять положение сущности в дереве. Либо она в корне, либо она ниже. И получится, когда мы выбираем один параметр, нам ни к чему контекст - мы к нему однозначно адресуемся. Проголосуем против избыточности? ---> - - - @@ -34,7 +30,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - @@ -66,20 +61,15 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - - - @@ -88,7 +78,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - @@ -103,7 +92,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - @@ -111,11 +99,10 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - + select p.param_value from svc_operation_cfs_param s @@ -123,7 +110,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In where s.svc_operation_cfs_param = 'resourceRealm' AND p.instance_operation_uid = - @@ -136,7 +122,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In и инстанс-операцию-параметр (регулярная реляционная иерархия) хотя инстанс и операция есть в параметрах (некоторое дублирование, потому что оркестратору все передается через параметры) ---> - @@ -149,7 +134,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In where p.svc_operation_cfs_param_id = AND r.ref_svc_id > 0 - @@ -163,7 +147,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In Можно сделать дополнительную фильтрацию по типу справочника (resourceRealm) ---> - @@ -183,9 +166,7 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In LEFT JOIN instance_cfs_param rp on (e.instance_uid=rp.instance_uid ) LEFT JOIN instance ri on (rp.instance_uid=ri.instance_uid) WHERE e.instance_uid= - UNION - SELECT i+1 AS i ,e.display_name @@ -202,7 +183,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In select param, param_value from r order by r.i desc - @@ -223,9 +203,7 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In --LEFT JOIN instance_cfs_param rp on (e.instance_uid=rp.instance_uid ) --LEFT JOIN instance ri on (rp.instance_uid=ri.instance_uid) WHERE e.instance_uid= - UNION - SELECT i+1 AS i ,e.display_name @@ -243,17 +221,14 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In order by r.i desc - - - @@ -264,12 +239,10 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In при этом мы ожидаем в параметрах структуру paramName:{subparamName:subparamValue} но почему не находим в сохраненных? возможно такое совпадение, что в сценарии у нас как раз надо выбрать svcId а они не ---> - - this.params[arguments.param] + this.params[arguments.param] @@ -281,7 +254,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In where p.instance_operation_uid = AND s.svc_operation_cfs_param = - @@ -293,24 +265,13 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - ---> - - @@ -319,24 +280,18 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - - - - @@ -346,12 +301,9 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - @@ -361,39 +313,11 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - - - - select g.instance_state_uid, g.version, g.dt_state, g.instance_data, g.is_test, g.instance_uid @@ -402,7 +326,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In order by g.version desc limit 1 - @@ -414,19 +337,14 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - select r.resource_realm_id, r.properties from resource_realm r where r.resource_realm= - @@ -439,17 +357,10 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - - - - - @@ -458,16 +369,13 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - select iop.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid iop.instance_operation_uid::text as instance_operation_uid iop.svc_operation_cfs_param_id - case when sop.is_sensitive then '********' else iop.param_value end as param_value iop.note to_char(iop.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created @@ -482,14 +390,11 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In sop.is_hidden sop.is_disabled sop.man - sop.func sop.expression sop.nested_ref sop.state_path sop.depends_on_cfs_params - - sop.config::text as config e.service_id e.instance_uid::text as instance_uid @@ -503,11 +408,9 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In where iop.instance_operation_cfs_param_uid= AND si.specification_id= - - - @@ -538,43 +440,32 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - - - - - - - - - select io.dt_submit, io.submit_result @@ -585,19 +476,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - select count(*) as cnt from instance_operation_cfs_param iop @@ -610,26 +488,20 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - delete from instance_operation_cfs_param where instance_operation_cfs_param_uid= - - - - - @@ -637,7 +509,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - update instance_operation_cfs_param set dt_created= @@ -649,14 +520,10 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - - select svc_operation_cfs_param_id @@ -666,11 +533,8 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - @@ -678,7 +542,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - сформировать дескриптор - замаскировать секреты ---> - @@ -693,7 +556,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - select sp.svc_operation_cfs_param_id @@ -722,8 +584,6 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In where sp.svc_operation_cfs_param_id= order by sp.sort - - select sp.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid @@ -735,11 +595,9 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In where sp.instance_operation_cfs_param_uid= order by sp.sort - - - @@ -818,21 +673,16 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - - - @@ -848,14 +698,10 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - - select distinct r.resource_realm, r.sort from resource_realm r @@ -867,21 +713,16 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In join svc s on r.resource_realm_type_id=s.resource_realm_type_id where s.svc_id= order by r.sort, r.resource_realm - + - - - - - select iop.param_value @@ -890,15 +731,13 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In where iop.instance_operation_uid= AND sop.svc_operation_cfs_param='resourceRealm' order by 1 - + - - @@ -916,19 +755,15 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - select properties::text from resource_realm where resource_realm='ngcloud.ru' - - - + @@ -940,12 +775,10 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - @@ -954,20 +787,5 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/v1/resources/instance_operation_cfs_subparam.cfc b/v1/resources/instance_operation_cfs_subparam.cfc index 52c60aa..8bdef5b 100644 --- a/v1/resources/instance_operation_cfs_subparam.cfc +++ b/v1/resources/instance_operation_cfs_subparam.cfc @@ -1,12 +1,8 @@ - - - - @@ -16,9 +12,7 @@ - - select @@ -26,7 +20,6 @@ ios.instance_operation_cfs_subparam ios.is_sensitive ios.note - to_char(ios.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created from instance_operation_cfs_subparam ios @@ -38,45 +31,31 @@ AND ios.instance_operation_cfs_subparam= AND si.specification_id= /*tenant isolation, из конфиденциального тут заметки... может быть, имена переменных окружения*/ - - - - - - - - - - - - select count(*) as cnt from instance_operation_cfs_subparam ios @@ -86,7 +65,6 @@ - select count(*) as cnt from instance_operation_cfs_param iop @@ -99,40 +77,31 @@ - delete from instance_operation_cfs_subparam where instance_operation_cfs_param_uid= AND instance_operation_cfs_subparam= - - - - - - - - select count(*) as cnt from instance_operation_cfs_param iop @@ -145,7 +114,6 @@ - select count(*) as cnt from instance_operation_cfs_subparam iop @@ -155,7 +123,6 @@ - update instance_operation_cfs_subparam set dt_updated= @@ -168,5 +135,4 @@ - - \ No newline at end of file + diff --git a/v1/resources/instance_operation_cfs_subparam_ls.cfc b/v1/resources/instance_operation_cfs_subparam_ls.cfc index d8099ed..d206fc3 100644 --- a/v1/resources/instance_operation_cfs_subparam_ls.cfc +++ b/v1/resources/instance_operation_cfs_subparam_ls.cfc @@ -1,25 +1,15 @@ - - - - - - - @@ -27,9 +17,7 @@ - - select count(*) as cnt from instance_operation_cfs_param iop @@ -42,7 +30,6 @@ - select count(*) as cnt from instance_operation_cfs_subparam ios @@ -52,7 +39,6 @@ - insert into instance_operation_cfs_subparam (instance_operation_cfs_param_uid, instance_operation_cfs_subparam, is_sensitive, note, dt_created, creator_id, dt_updated, updater_id) @@ -68,14 +54,8 @@ , ); - - - - - - - \ No newline at end of file + diff --git a/v1/resources/instance_operation_default.cfc b/v1/resources/instance_operation_default.cfc index 104b806..c15be27 100644 --- a/v1/resources/instance_operation_default.cfc +++ b/v1/resources/instance_operation_default.cfc @@ -1,28 +1,21 @@ - - - - - - - select @@ -36,11 +29,9 @@ from svc_operation o where o.svc_operation_id= - - @@ -62,13 +53,10 @@ - - select p.svc_operation_cfs_param_id - p.svc_operation_cfs_param p.label p.data_type @@ -92,7 +80,6 @@ p.man p.sort p.nested_ref - p.config::text null as nested_ref_data p.state_path @@ -114,8 +101,6 @@ AND p.is_actual order by p.sort, p.svc_operation_cfs_param_id - - - @@ -147,12 +131,10 @@ returnVariable="local.qCfsParam.value_list" /> - - @@ -184,43 +166,31 @@ where sp.svc_operation_cfs_param_id= order by sp.sort - - - - - - - - - ---> - - - - - - - - - - - @@ -280,16 +240,11 @@ - - - - - @@ -297,7 +252,6 @@ - @@ -316,7 +270,5 @@ - - diff --git a/v1/resources/instance_operation_ls.cfc b/v1/resources/instance_operation_ls.cfc index cc9cbb7..b13a2bc 100644 --- a/v1/resources/instance_operation_ls.cfc +++ b/v1/resources/instance_operation_ls.cfc @@ -1,10 +1,8 @@ - - - - - - - - - - - @@ -59,8 +48,6 @@ - - select @@ -112,7 +99,6 @@ offset #arguments.pageSize*(arguments.page-1)# - select count(*) as cnt #local.fromClause# @@ -120,60 +106,43 @@ s.specification_id= - select count(*) as cnt #local.fromClause# - where s.specification_id= - - - - - - - - - - - - + - select count(*) as cnt from svc_operation so @@ -185,7 +154,6 @@ - select count(*) as cnt from instance e @@ -199,19 +167,12 @@ - - - - - insert into instance_operation @@ -228,30 +189,24 @@ , ); - - - - - - select c.contract_id from instance e @@ -260,7 +215,6 @@ join contract c on (s.contract_id=c.contract_id) where e.instance_uid= - select r.resource_realm_type_id from resource_realm r @@ -273,7 +227,6 @@ - select r.resource_realm_id from resource_realm r @@ -283,7 +236,6 @@ OR a.contract_id=0) AND a.is_enabled - @@ -297,5 +249,4 @@ ---> - - \ No newline at end of file + diff --git a/v1/resources/instance_operation_validate.cfc b/v1/resources/instance_operation_validate.cfc index f60cae2..33d59db 100644 --- a/v1/resources/instance_operation_validate.cfc +++ b/v1/resources/instance_operation_validate.cfc @@ -1,24 +1,15 @@ - - - - - - - - - diff --git a/v1/resources/svc.cfc b/v1/resources/svc.cfc index 8b13402..fbed06a 100644 --- a/v1/resources/svc.cfc +++ b/v1/resources/svc.cfc @@ -1,11 +1,8 @@ - - - @@ -14,10 +11,6 @@ - - - - select @@ -37,7 +30,6 @@ from svc s where svc_id= - select @@ -50,29 +42,19 @@ from svc_operation j where j.svc_id= - - - - - - - - - \ No newline at end of file + diff --git a/v1/resources/svc_grouped_ls.cfc b/v1/resources/svc_grouped_ls.cfc index 6f62d36..b0070a7 100644 --- a/v1/resources/svc_grouped_ls.cfc +++ b/v1/resources/svc_grouped_ls.cfc @@ -1,12 +1,9 @@ - - - - - - - - - - - + - - - select s.svc_id s.svc s.svc_short - s.code (select url from svc_operation so where so.operation='create' AND so.svc_id=s.svc_id limit 1) as create_url s.is_production_ready @@ -98,72 +80,41 @@ ) where 1=1 order by g.sort, g.svc_group_id - length limit---> + length limit---> - - - - - - - - - > - - - почему-то здесь работает без structCopy - - - + - - - - - - - \ No newline at end of file + diff --git a/v1/resources/svc_ls.cfc b/v1/resources/svc_ls.cfc index 7113e4d..74b07db 100644 --- a/v1/resources/svc_ls.cfc +++ b/v1/resources/svc_ls.cfc @@ -1,10 +1,8 @@ - - - @@ -35,24 +32,17 @@ - - - - - - - - - - @@ -81,8 +68,6 @@ - - @@ -101,21 +86,16 @@ - - + - - - - to_char(s.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated (coalesce(s.svc,'') ||' '|| coalesce(s.svc_short,'') ||' '|| coalesce(s.synonyms,'')) as svc_extended_name - - - select #local.definedRecordFields#* from @@ -184,8 +156,6 @@ where 1=1 order by - - select count(*) as cnt @@ -196,29 +166,21 @@ - - - - - - - - - \ No newline at end of file + diff --git a/v1/resources/svc_operation.cfc b/v1/resources/svc_operation.cfc index 5944d1f..d129347 100644 --- a/v1/resources/svc_operation.cfc +++ b/v1/resources/svc_operation.cfc @@ -1,11 +1,8 @@ - - - @@ -14,7 +11,6 @@ - select @@ -27,12 +23,10 @@ from svc_operation o where o.svc_operation_id= - select p.svc_operation_cfs_param_id - p.svc_operation_cfs_param p.label p.data_type @@ -73,18 +67,14 @@ AND p.is_actual order by p.sort, p.svc_operation_cfs_param_id - - - - - - - @@ -110,7 +97,5 @@ - - - \ No newline at end of file + diff --git a/v1/resources/user.cfc b/v1/resources/user.cfc index 30140de..174ceb1 100644 --- a/v1/resources/user.cfc +++ b/v1/resources/user.cfc @@ -1,44 +1,21 @@ - - - - - - - - - - - - select s.specification_id - c.contract_id c.contragent_id - from specification s join contract c on (s.contract_id=c.contract_id) @@ -47,44 +24,26 @@ order by specification_id desc limit 1; - - select u.usr_id - k.contragent_id - - - from usr u left outer join contragent k on u.contragent_id=k.contragent_id where u.usr_id= - - - - - - - - - - - \ No newline at end of file + diff --git a/v1/resources/vault_record.cfc b/v1/resources/vault_record.cfc index 39be9c1..0e663ba 100644 --- a/v1/resources/vault_record.cfc +++ b/v1/resources/vault_record.cfc @@ -1,41 +1,21 @@ - - - - - - - - - @@ -59,16 +39,12 @@ order by st.version desc limit 1 - - - - @@ -82,7 +58,6 @@ - - - - - - - - - - @@ -158,7 +124,6 @@ - @@ -171,25 +136,10 @@ - - - - - - - - - - - \ No newline at end of file +