Skip to content

Commit

Permalink
Small fixes after APEX 24.1 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
jariolaine committed Jul 14, 2024
1 parent 026bcba commit 5c94cf5
Show file tree
Hide file tree
Showing 22 changed files with 228 additions and 219 deletions.
62 changes: 31 additions & 31 deletions APEX/Supporting_Objects/admin/database_objects.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2279,26 +2279,26 @@ select
,(
select
json_object(
'post_id' : lkp_post.post_id
,'post_title' : lkp_post.post_title
'post_id' : lkp_next.post_id
,'post_title' : lkp_next.post_title
) as post
from q1 lkp_post
from q1 lkp_next
where 1 = 1
and lkp_post.published_on > q1.published_on
order by lkp_post.published_on asc
and lkp_next.published_on > q1.published_on
order by lkp_next.published_on asc
fetch first 1 rows only
) as next_post
-- Fetch previous post id and title
,(
select
json_object(
'post_id' : lkp_post.post_id
,'post_title' : lkp_post.post_title
'post_id' : lkp_prev.post_id
,'post_title' : lkp_prev.post_title
) as post
from q1 lkp_post
from q1 lkp_prev
where 1 = 1
and lkp_post.published_on < q1.published_on
order by lkp_post.published_on desc
and lkp_prev.published_on < q1.published_on
order by lkp_prev.published_on desc
fetch first 1 rows only
) as prev_post
from q1
Expand Down Expand Up @@ -2464,33 +2464,33 @@ with read only
--------------------------------------------------------
create or replace force view blog_v_posts_last20 as
select
rownum as display_seq
,q1.post_id as post_id
,q1.published_on as published_on
,q1.blogger_name as blogger_name
,q1.post_title as post_title
,q1.post_desc as post_desc
,q1.category_title as category_title
,q1.post_url as post_url
,q1.body_html as body_html
,q1.absolute_url as absolute_url
,apex_string.format(
rownum as display_seq
, q1.post_id as post_id
, q1.published_on as published_on
, q1.blogger_name as blogger_name
, q1.post_title as post_title
, q1.post_desc as post_desc
, q1.category_title as category_title
, q1.post_url as post_url
, q1.body_html as body_html
, q1.absolute_url as absolute_url
, apex_string.format(
p_message => 'data-item-id="%s"'
,p0 => q1.post_id
) as list_attr
from (
select --+ first_rows(20)
v1.post_id
,v1.published_on
,v1.blogger_name
,v1.post_title
,v1.post_desc
,v1.category_title
,v1.post_url
,v1.body_html
,blog_url.get_post(
v1.post_id
, v1.published_on
, v1.blogger_name
, v1.post_title
, v1.post_desc
, v1.category_title
, v1.post_url
, v1.body_html
, blog_url.get_post(
p_post_id => v1.post_id
,p_canonical => 'YES'
, p_canonical => 'YES'
) as absolute_url
from blog_v_posts v1
order by v1.published_on desc
Expand Down
2 changes: 1 addition & 1 deletion APEX/Supporting_Objects/public/metadata.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--------------------------------------------------------
-- Inserting into BLOG_SETTINGS
--------------------------------------------------------
insert into blog_settings(display_seq,is_nullable,attribute_name,data_type,attribute_group_message,int_min,int_max,attribute_value) values('10','0','G_APP_VERSION','STRING','INTERNAL',null,null,'Release 24.1.0.20240711');
insert into blog_settings(display_seq,is_nullable,attribute_name,data_type,attribute_group_message,int_min,int_max,attribute_value) values('10','0','G_APP_VERSION','STRING','INTERNAL',null,null,'Release 24.1.0.20240714');
insert into blog_settings(display_seq,is_nullable,attribute_name,data_type,attribute_group_message,int_min,int_max,attribute_value) values('20','0','G_PUB_APP_ID','STRING','INTERNAL',null,null,blog_util.int_to_vc2(apex_application_install.get_application_id));
insert into blog_settings(display_seq,is_nullable,attribute_name,data_type,attribute_group_message,int_min,int_max,attribute_value) values('110','0','BLOG_APP_NAME','STRING','BLOG_SETTING_GROUP_GENERAL',null,null,'My Blog');
insert into blog_settings(display_seq,is_nullable,attribute_name,data_type,attribute_group_message,int_min,int_max,attribute_value) values('120','0','BLOG_APP_DESC','STRING','BLOG_SETTING_GROUP_GENERAL',null,null,'About Almost Everything');
Expand Down
62 changes: 31 additions & 31 deletions APEX/Upgrade/public/database_objects_upgrade.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1870,26 +1870,26 @@ select
,(
select
json_object(
'post_id' : lkp_post.post_id
,'post_title' : lkp_post.post_title
'post_id' : lkp_next.post_id
,'post_title' : lkp_next.post_title
) as post
from q1 lkp_post
from q1 lkp_next
where 1 = 1
and lkp_post.published_on > q1.published_on
order by lkp_post.published_on asc
and lkp_next.published_on > q1.published_on
order by lkp_next.published_on asc
fetch first 1 rows only
) as next_post
-- Fetch previous post id and title
,(
select
json_object(
'post_id' : lkp_post.post_id
,'post_title' : lkp_post.post_title
'post_id' : lkp_prev.post_id
,'post_title' : lkp_prev.post_title
) as post
from q1 lkp_post
from q1 lkp_prev
where 1 = 1
and lkp_post.published_on < q1.published_on
order by lkp_post.published_on desc
and lkp_prev.published_on < q1.published_on
order by lkp_prev.published_on desc
fetch first 1 rows only
) as prev_post
from q1
Expand Down Expand Up @@ -2055,33 +2055,33 @@ with read only
--------------------------------------------------------
create or replace force view blog_v_posts_last20 as
select
rownum as display_seq
,q1.post_id as post_id
,q1.published_on as published_on
,q1.blogger_name as blogger_name
,q1.post_title as post_title
,q1.post_desc as post_desc
,q1.category_title as category_title
,q1.post_url as post_url
,q1.body_html as body_html
,q1.absolute_url as absolute_url
,apex_string.format(
rownum as display_seq
, q1.post_id as post_id
, q1.published_on as published_on
, q1.blogger_name as blogger_name
, q1.post_title as post_title
, q1.post_desc as post_desc
, q1.category_title as category_title
, q1.post_url as post_url
, q1.body_html as body_html
, q1.absolute_url as absolute_url
, apex_string.format(
p_message => 'data-item-id="%s"'
,p0 => q1.post_id
) as list_attr
from (
select --+ first_rows(20)
v1.post_id
,v1.published_on
,v1.blogger_name
,v1.post_title
,v1.post_desc
,v1.category_title
,v1.post_url
,v1.body_html
,blog_url.get_post(
v1.post_id
, v1.published_on
, v1.blogger_name
, v1.post_title
, v1.post_desc
, v1.category_title
, v1.post_url
, v1.body_html
, blog_url.get_post(
p_post_id => v1.post_id
,p_canonical => 'YES'
, p_canonical => 'YES'
) as absolute_url
from blog_v_posts v1
order by v1.published_on desc
Expand Down
2 changes: 1 addition & 1 deletion APEX/Upgrade/public/postupgrade.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- Update version info
--------------------------------------------------------
update blog_settings
set attribute_value = 'Release 24.1.0.20240711'
set attribute_value = 'Release 24.1.0.20240714'
where 1 = 1
and attribute_name = 'G_APP_VERSION'
;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ wwv_imp_workspace.create_flow(
,p_public_user=>'APEX_PUBLIC_USER'
,p_proxy_server=>nvl(wwv_flow_application_install.get_proxy,'')
,p_no_proxy_domains=>nvl(wwv_flow_application_install.get_no_proxy_domains,'')
,p_flow_version=>'Release 24.1.0.20240711'
,p_flow_version=>'Release 24.1.0.20240714'
,p_flow_status=>'AVAILABLE_W_EDIT_LINK'
,p_flow_unavailable_text=>'This application is currently unavailable at this time.'
,p_exact_substitutions_only=>'Y'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2309,31 +2309,31 @@ wwv_flow_imp_shared.append_to_install_script(
' ,(',
' select',
' json_object(',
' ''post_id'' : lkp_post.post_id',
' ,''post_title'' : lkp_post.post_title',
' ''post_id'' : lkp_next.post_id',
' ,''post_title'' : lkp_next.post_title',
' ) as post',
' from q1 lkp_post',
' from q1 lkp_next',
' where 1 = 1',
' and lkp_post.published_on > q1.published_on',
' order by lkp_post.published_on asc',
' and lkp_next.published_on > q1.published_on',
' order by lkp_next.published_on asc',
' fetch first 1 rows only',
' ) as next_post',
'-- Fetch previous post id and title',
' ,(',
' select',
' json_object(',
' ''post_id'' : lkp_post.post_id',
' ,''post_title'' : lkp_post.post_title',
' ''post_id'' : lkp_prev.post_id',
' ,''post_title'' : lkp_prev.post_title',
' ) as post',
' from q1 lkp_post',
' from q1 lkp_prev',
' where 1 = 1',
' and lkp_post.published'))
' and lkp_prev.published'))
);
wwv_flow_imp_shared.append_to_install_script(
p_id=>wwv_flow_imp.id(32897013199918411)
,p_script_clob=>wwv_flow_string.join(wwv_flow_t_varchar2(
'_on < q1.published_on',
' order by lkp_post.published_on desc',
' order by lkp_prev.published_on desc',
' fetch first 1 rows only',
' ) as prev_post',
'from q1',
Expand Down Expand Up @@ -2499,33 +2499,33 @@ wwv_flow_imp_shared.append_to_install_script(
'--------------------------------------------------------',
'create or replace force view blog_v_posts_last20 as',
'select',
' rownum as display_seq',
' ,q1.post_id as post_id',
' ,q1.published_on as published_on',
' ,q1.blogger_name as blogger_name',
' ,q1.post_title as post_title',
' ,q1.post_desc as post_desc',
' ,q1.category_title as category_title',
' ,q1.post_url as post_url',
' ,q1.body_html as body_html',
' ,q1.absolute_url as absolute_url',
' ,apex_string.format(',
' rownum as display_seq',
', q1.post_id as post_id',
', q1.published_on as published_on',
', q1.blogger_name as blogger_name',
', q1.post_title as post_title',
', q1.post_desc as post_desc',
', q1.category_title as category_title',
', q1.post_url as post_url',
', q1.body_html as body_html',
', q1.absolute_url as absolute_url',
', apex_string.format(',
' p_message => ''data-item-id="%s"''',
' ,p0 => q1.post_id',
' ) as list_attr',
'from (',
' select --+ first_rows(20)',
' v1.post_id',
' ,v1.published_on',
' ,v1.blogger_name',
' ,v1.post_title',
' ,v1.post_desc',
' ,v1.category_title',
' ,v1.post_url',
' ,v1.body_html',
' ,blog_url.get_post(',
' v1.post_id',
' , v1.published_on',
' , v1.blogger_name',
' , v1.post_title',
' , v1.post_desc',
' , v1.category_title',
' , v1.post_url',
' , v1.body_html',
' , blog_url.get_post(',
' p_post_id => v1.post_id',
' ,p_canonical => ''YES''',
' , p_canonical => ''YES''',
' ) as absolute_url',
' from blog_v_posts v1',
' order by v1.published_on desc',
Expand Down Expand Up @@ -3338,12 +3338,12 @@ wwv_flow_imp_shared.append_to_install_script(
'--------------------------------------------------------------------------------',
'--------------------------------------------------------------------------------',
'-- Private procedures and functions',
'---------------------------------------------------------'))
'------------------------------------------------------------------------------'))
);
wwv_flow_imp_shared.append_to_install_script(
p_id=>wwv_flow_imp.id(32897013199918411)
,p_script_clob=>wwv_flow_string.join(wwv_flow_t_varchar2(
'-----------------------',
'--',
'--------------------------------------------------------------------------------',
'-- none',
'--------------------------------------------------------------------------------',
Expand Down Expand Up @@ -4377,12 +4377,12 @@ wwv_flow_imp_shared.append_to_install_script(
' g.group_name',
' from apex_workspace_groups g',
' left join apex_workspace_group_groups gg on g.group_name = gg.grantee_name',
' left join apex_workspace_group_users gu on g.'))
' left join apex_workspace_group_users gu on g.group_name = gu.group'))
);
wwv_flow_imp_shared.append_to_install_script(
p_id=>wwv_flow_imp.id(32897013199918411)
,p_script_clob=>wwv_flow_string.join(wwv_flow_t_varchar2(
'group_name = gu.group_name',
'_name',
' and gu.user_name = l_user_name',
' left join apex_workspace_apex_users u on gu.user_name = u.user_name',
' and u.account_locked = ''No''',
Expand Down Expand Up @@ -5408,12 +5408,12 @@ wwv_flow_imp_shared.append_to_install_script(
' "category": {"page": "CATEGORY", "items": "P14_CATEGORY_ID"},',
' "archive": {"page": "ARCHIVES", "items": "P15_ARCHIVE_ID"},',
' "tag": {"page": "TAG", "items": "P6_TAG_ID"},',
' "unsubscribe": {"page": "POST",'))
' "unsubscribe": {"page": "POST", "items": "P2_POST_ID'))
);
wwv_flow_imp_shared.append_to_install_script(
p_id=>wwv_flow_imp.id(32897013199918411)
,p_script_clob=>wwv_flow_string.join(wwv_flow_t_varchar2(
' "items": "P2_POST_ID,P2_SUBSCRIPTION_ID"}',
',P2_SUBSCRIPTION_ID"}',
' }'' );',
'',
'-- cache rss and atom url',
Expand Down Expand Up @@ -6435,12 +6435,12 @@ wwv_flow_imp_shared.append_to_install_script(
'--------------------------------------------------------------------------------',
'-- Private constants and variables',
'--------------------------------------------------------------------------------',
''))
'---------------------'))
);
wwv_flow_imp_shared.append_to_install_script(
p_id=>wwv_flow_imp.id(32897013199918411)
,p_script_clob=>wwv_flow_string.join(wwv_flow_t_varchar2(
'--------------------------------------------------------------------------------',
'-----------------------------------------------------------',
'',
' c_link_canonical_template constant varchar2(64) := ''<link rel="canonical" href="%s">'';',
' c_link_alternate_template constant varchar2(64) := ''<link rel="alternate" href="%s" title="%s" type="%s">'';',
Expand Down Expand Up @@ -7430,12 +7430,12 @@ wwv_flow_imp_shared.append_to_install_script(
' p_blob_content => l_xml',
' ,p_mime_type => c_mime_xml',
' ,p_header_names => c_headers',
' ,p_header_values => apex_t_varchar2( l_cache_control, ''inline; filen'))
' ,p_header_values => apex_t_varchar2( l_cache_control, ''inline; filename="sitemap-categori'))
);
wwv_flow_imp_shared.append_to_install_script(
p_id=>wwv_flow_imp.id(32897013199918411)
,p_script_clob=>wwv_flow_string.join(wwv_flow_t_varchar2(
'ame="sitemap-categories.xml"'', null )',
'es.xml"'', null )',
' ,p_charset => c_char_set',
' );',
'',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ wwv_flow_imp_shared.create_message(
p_id=>wwv_flow_imp.id(55636898271377244)
,p_name=>'BLOG_APP_DESC'
,p_message_text=>'About Almost Everything'
,p_version_scn=>41373793344475
,p_version_scn=>41374218034127
);
wwv_flow_imp_shared.create_message(
p_id=>wwv_flow_imp.id(55636638660376194)
,p_name=>'BLOG_APP_NAME'
,p_message_text=>'My Blog'
,p_version_scn=>41373793344470
,p_version_scn=>41374218034127
);
wwv_flow_imp_shared.create_message(
p_id=>wwv_flow_imp.id(10038616769932485)
Expand Down
Loading

0 comments on commit 5c94cf5

Please sign in to comment.