Skip to content

Commit 222f28d

Browse files
ogobrechtogobrecht
committed
fixed #49, #50, #51, #52, #53 
1 parent 41e996a commit 222f28d

File tree

9 files changed

+450
-256
lines changed

9 files changed

+450
-256
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ SIGNATURE
8383
```sql
8484
PACKAGE om_tapigen AUTHID CURRENT_USER IS
8585
c_generator CONSTANT VARCHAR2(10 CHAR) := 'OM_TAPIGEN';
86-
c_generator_version CONSTANT VARCHAR2(10 CHAR) := '0.6.2';
86+
c_generator_version CONSTANT VARCHAR2(10 CHAR) := '0.6.3';
8787
```
8888

8989

‎docs/changelog.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Please use for all comments, discussions, feature requests or bug reports the Gi
2121

2222
<!-- toc -->
2323

24+
- [0.6.3 (2023-08-15)](#063-2023-08-15)
2425
- [0.6.2 (2023-04-23)](#062-2023-04-23)
2526
- [0.6.1 (2022-03-06)](#061-2022-03-06)
2627
- [0.6.0 (2020-12-20)](#060-2020-12-20)
@@ -35,9 +36,17 @@ Please use for all comments, discussions, feature requests or bug reports the Gi
3536

3637
<!-- tocstop -->
3738

39+
## 0.6.3 (2023-08-15)
40+
41+
- Fixed #53: Generating default values for virtual columns - Thanks to Leon (https://github.com/ljvankempen) for reporting the issue
42+
- Fixed #52: Error installing on oracle 23c free - Thanks to Leon (https://github.com/ljvankempen) for reporting the issue
43+
- Fixed #51: P%COLUMN_MAPPING parameters are case sensitive- Thanks to Paolo (https://github.com/softinn72) for reporting the issue
44+
- Fixed #50: Specifying shorter table name substitution variables in p_one_to_one_view_name generates corrupted view name - Thanks to Paolo (https://github.com/softinn72) for reporting the issue
45+
- Fixed #49: Tenant column filter is missing from generated views - Thanks to Paolo (https://github.com/softinn72) for reporting the issue
46+
3847
## 0.6.2 (2023-04-23)
3948

40-
- Fixed: Install issue with database 23c free - Thanks to Steffen Clauß (github.com/scl-4711) for reporting the issue
49+
- Fixed #47: Oracle 23c Free - Install-Script returns ORA-01422 - Thanks to Steffen Clauß (github.com/scl-4711) for reporting the issue
4150

4251
## 0.6.1 (2022-03-06)
4352

‎om_tapigen_install.sql‎

Lines changed: 80 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ begin
1818
end if;
1919
if to_number(v_db_version) >= 180 then
2020
execute immediate q'[
21-
select replace(regexp_substr(version_full, '\d+\.\d+'), '.', null) as db_version
21+
select replace(regexp_substr(min(version_full), '\d+\.\d+'), '.', null) as db_version
2222
from product_component_version
2323
where product like 'Oracle Database%' ]'
2424
into v_db_version;
@@ -36,7 +36,7 @@ end;
3636
prompt Compile package om_tapigen (spec)
3737
CREATE OR REPLACE PACKAGE om_tapigen AUTHID CURRENT_USER IS
3838
c_generator CONSTANT VARCHAR2(10 CHAR) := 'OM_TAPIGEN';
39-
c_generator_version CONSTANT VARCHAR2(10 CHAR) := '0.6.2';
39+
c_generator_version CONSTANT VARCHAR2(10 CHAR) := '0.6.3';
4040
/**
4141
Oracle PL/SQL Table API Generator
4242
=================================
@@ -910,7 +910,7 @@ CREATE OR REPLACE PACKAGE BODY om_tapigen IS
910910
WHEN p_data_type = 'BLOB' THEN
911911
'TO_BLOB(UTL_RAW.cast_to_raw(''@@@@@@@@@@@@@@@''))'
912912
WHEN p_data_type = 'RAW' THEN
913-
'UTL_RAW.cast_to_raw(''@@@@@@@@@@@@@@@'')'
913+
'UTL_RAW.cast_to_raw(''@@@@@@@@@@@@@@@'')'
914914
WHEN p_data_type = 'XMLTYPE' THEN
915915
'XMLTYPE(''<NULL/>'')'
916916
ELSE
@@ -1097,14 +1097,14 @@ CREATE OR REPLACE PACKAGE BODY om_tapigen IS
10971097

10981098
-- 1. Possible substitutions: #TABLE_NAME#, #COLUMN_PREFIX# and #PK_COLUMN# (the first column on multicolumn primary keys)
10991099
-- 2. To be backward compatible we have to support things like this #TABLE_NAME_26# (this is like substr(table_name, 1, 26))
1100-
-- 3. If someone want to use the substr version he has always to provide position and length.
1100+
-- 3. If someone want to use the substr version - please always provide position and length.
11011101
-- 4. Negative position is supported like this #TABLE_NAME_-15_15# (the second number can not be omitted like in substr, see 2.)
11021102
IF v_position IS NULL AND v_length IS NULL THEN
11031103
v_position := 1;
11041104
v_length := 200;
11051105
ELSIF v_position IS NOT NULL AND v_length IS NULL THEN
1106-
v_position := 1;
11071106
v_length := v_position; -- see point 2. above
1107+
v_position := 1;
11081108
END IF;
11091109

11101110
v_return := replace(p_name_template,
@@ -1839,6 +1839,32 @@ CREATE OR REPLACE PACKAGE BODY om_tapigen IS
18391839
RETURN v_result;
18401840
END list_columns_w_pk_full;
18411841

1842+
-----------------------------------------------------------------------------
1843+
/*
1844+
col1,
1845+
col2,
1846+
*/
1847+
FUNCTION list_columns_w_pk_view RETURN t_tab_list IS
1848+
v_result t_tab_list;
1849+
v_list_padding t_vc2_30;
1850+
v_index pls_integer;
1851+
BEGIN
1852+
v_list_padding := get_list_padding(6);
1853+
FOR i IN 1 .. g_columns.count LOOP
1854+
IF g_columns(i).is_hidden_yn = 'N'
1855+
AND g_columns(i).tenant_expression is null
1856+
THEN
1857+
v_index := v_result.count + 1;
1858+
v_result(v_index).col1 := v_list_padding;
1859+
v_result(v_index).col2 :=
1860+
util_double_quote(g_columns(i).column_name) ||
1861+
get_column_comment(i) ||
1862+
c_list_delimiter;
1863+
END IF;
1864+
END LOOP;
1865+
trim_list(v_result);
1866+
RETURN v_result;
1867+
END list_columns_w_pk_view;
18421868

18431869
-----------------------------------------------------------------------------
18441870
/*
@@ -2625,7 +2651,10 @@ CREATE OR REPLACE PACKAGE BODY om_tapigen IS
26252651
v_list_padding := get_list_padding(4);
26262652
v_operator_padding := get_operator_padding;
26272653
FOR i IN 1 .. g_columns.count LOOP
2628-
IF g_columns(i).data_default IS NOT NULL AND g_columns(i).is_hidden_yn = 'N' THEN
2654+
IF g_columns(i).data_default IS NOT NULL
2655+
AND g_columns(i).is_hidden_yn = 'N'
2656+
AND g_columns(i).is_virtual_yn = 'N'
2657+
THEN
26292658
v_index := v_result.count + 1;
26302659
v_result(v_index).col1 := v_list_padding || 'v_row.' ||
26312660
util_double_quote(g_columns(i).column_name);
@@ -2710,12 +2739,36 @@ CREATE OR REPLACE PACKAGE BODY om_tapigen IS
27102739

27112740
-----------------------------------------------------------------------------
27122741

2742+
FUNCTION list_where_clause_tenant_id RETURN t_tab_list IS
2743+
v_result t_tab_list;
2744+
v_index pls_integer;
2745+
BEGIN
2746+
FOR i IN 1 .. g_columns.count LOOP
2747+
IF g_columns(i).tenant_expression IS NOT NULL THEN
2748+
v_index := v_result.count + 1;
2749+
v_result(v_index).col1 := 'WHERE ';
2750+
v_result(v_index).col2 :=
2751+
util_get_attribute_compare (
2752+
p_data_type => g_columns(i).data_type,
2753+
p_nullable => util_string_to_bool(g_columns(i).is_nullable_yn),
2754+
p_first_attribute => util_double_quote(g_columns(i).column_name),
2755+
p_second_attribute => g_columns(i).tenant_expression,
2756+
p_compare_operation => '=' );
2757+
END IF;
2758+
END LOOP;
2759+
RETURN v_result;
2760+
END list_where_clause_tenant_id;
2761+
2762+
-----------------------------------------------------------------------------
2763+
27132764
BEGIN
27142765
CASE p_list_name
27152766
WHEN 'LIST_INSERT_COLUMNS' THEN
27162767
RETURN list_insert_columns;
27172768
WHEN 'LIST_COLUMNS_W_PK_FULL' THEN
27182769
RETURN list_columns_w_pk_full;
2770+
WHEN 'LIST_COLUMNS_W_PK_VIEW' THEN
2771+
RETURN list_columns_w_pk_view;
27192772
WHEN 'LIST_ROWCOLS_W_DICT_DEFAULTS' THEN
27202773
RETURN list_rowcols_w_dict_defaults;
27212774
WHEN 'LIST_ROWCOLS_W_CUST_DEFAULTS' THEN
@@ -2774,6 +2827,8 @@ CREATE OR REPLACE PACKAGE BODY om_tapigen IS
27742827
RETURN list_uk_map_param_eq_param;
27752828
WHEN 'LIST_SPEC_CUSTOM_DEFAULTS' THEN
27762829
RETURN list_spec_custom_defaults;
2830+
WHEN 'LIST_WHERE_CLAUSE_TENANT_ID' THEN
2831+
RETURN list_where_clause_tenant_id;
27772832
ELSE
27782833
raise_application_error(c_generator_error_number, 'FIXME: Bug - list ' || p_list_name || ' not defined');
27792834
END CASE;
@@ -3605,7 +3660,11 @@ CREATE OR REPLACE PACKAGE BODY om_tapigen IS
36053660
v_idx := g_columns_reverse_index(v_column_name);
36063661
g_columns(v_idx).audit_type := p_audit_type;
36073662
EXCEPTION
3608-
WHEN no_data_found THEN NULL;
3663+
WHEN no_data_found THEN
3664+
raise_application_error(c_generator_error_number,
3665+
'Invalid column name ' || v_column_name || c_lf ||
3666+
'provided for the parameter p_audit_column_mappings' || c_lf ||
3667+
'and audit type ' || p_audit_type );
36093668
WHEN others THEN raise;
36103669
END;
36113670
END IF;
@@ -3661,15 +3720,13 @@ CREATE OR REPLACE PACKAGE BODY om_tapigen IS
36613720
v_idx := g_columns_reverse_index(v_column_name);
36623721
g_columns(v_idx).row_version_expression := v_expression;
36633722
EXCEPTION
3664-
WHEN no_data_found THEN NULL;
3723+
WHEN no_data_found THEN
3724+
raise_application_error(c_generator_error_number,
3725+
'Invalid column name ' || v_column_name || c_lf ||
3726+
'provided for the parameter p_row_version_column_mapping.' || c_lf ||
3727+
'Example Usage: #PREFIX#_MY_COLUMN_NAME=my_version_sequence.nextval');
36653728
WHEN others THEN raise;
36663729
END;
3667-
IF v_idx IS NULL THEN
3668-
raise_application_error(c_generator_error_number,
3669-
'Invalid column name provided in the parameter' || c_lf ||
3670-
'p_row_version_column_mapping.' || c_lf ||
3671-
'Example Usage: #PREFIX#_MY_COLUMN_NAME=my_version_sequence.nextval');
3672-
END IF;
36733730
util_debug_stop_one_step;
36743731
END IF;
36753732
END IF;
@@ -3707,15 +3764,13 @@ CREATE OR REPLACE PACKAGE BODY om_tapigen IS
37073764
v_idx := g_columns_reverse_index(v_column_name);
37083765
g_columns(v_idx).tenant_expression := v_expression;
37093766
EXCEPTION
3710-
WHEN no_data_found THEN NULL;
3767+
WHEN no_data_found THEN
3768+
raise_application_error(c_generator_error_number,
3769+
'Invalid column name ' || v_column_name || c_lf ||
3770+
'provided for the parameter p_tenant_column_mapping.' || c_lf ||
3771+
q'[Example Usage: #PREFIX#_MY_COLUMN_NAME=to_number(sys_context('my_sec_ctx','my_tenant_id'))]');
37113772
WHEN others THEN raise;
37123773
END;
3713-
IF v_idx IS NULL THEN
3714-
raise_application_error(c_generator_error_number,
3715-
'Invalid column name provided in the parameter' || c_lf ||
3716-
'p_tenant_column_mapping.' || c_lf ||
3717-
q'[Example Usage: #PREFIX#_MY_COLUMN_NAME=to_number(sys_context('my_sec_ctx','my_tenant_id'))]');
3718-
END IF;
37193774
util_debug_stop_one_step;
37203775
END IF;
37213776
END IF;
@@ -5169,8 +5224,9 @@ END {{ API_NAME }};';
51695224

51705225
g_code_blocks.template := '
51715226
CREATE OR REPLACE VIEW {{ OWNER }}.{{ DML_VIEW_NAME }} AS
5172-
SELECT {% LIST_COLUMNS_W_PK_FULL %}
5227+
SELECT {% LIST_COLUMNS_W_PK_VIEW %}
51735228
FROM {{ TABLE_NAME }}
5229+
{% LIST_WHERE_CLAUSE_TENANT_ID %}
51745230
/*
51755231
This is the DML view for the table {{ TABLE_NAME }}.
51765232
- Generator: {{ GENERATOR }}
@@ -5238,8 +5294,9 @@ END {{ DML_VIEW_TRIGGER_NAME }};';
52385294

52395295
g_code_blocks.template := '
52405296
CREATE OR REPLACE VIEW {{ OWNER }}.{{ ONE_TO_ONE_VIEW_NAME }} AS
5241-
SELECT {% LIST_COLUMNS_W_PK_FULL %}
5297+
SELECT {% LIST_COLUMNS_W_PK_VIEW %}
52425298
FROM {{ TABLE_NAME }}
5299+
{% LIST_WHERE_CLAUSE_TENANT_ID %}
52435300
WITH READ ONLY
52445301
/*
52455302
This is the 1:1 view for the table {{ TABLE_NAME }}.

0 commit comments

Comments
 (0)