Added FORCE, added support for 32k long values

Sergejs Vinniks · Sergejs Vinniks · commit 4ed22ecb9e7b · 2019-02-26T21:55:40.000+02:00
diff --git a/install/install.sql b/install/install.sql
@@ -40,11 +40,6 @@
 @@types/t_json_mismatches.tps
 /
 
-@@packages/json_parser.pks
-/
-@@packages/json_parser.pkb
-/
-
 @@functions/to_index.fnc
 /
 
@@ -61,6 +56,11 @@
 @@data/json_values.sql
 /
 
+@@packages/json_parser.pks
+/
+@@packages/json_parser.pkb
+/
+
 @@packages/json_core.pks
 /
 @@packages/json_core.pkb
diff --git a/install/uninstall.sql b/install/uninstall.sql
@@ -19,29 +19,29 @@ DROP PACKAGE json_store
 
 DROP FUNCTION persistent_json_table
 /
-DROP TYPE t_persistent_json_table
+DROP TYPE t_persistent_json_table FORCE
 /
-DROP TYPE t_json_table
+DROP TYPE t_json_table FORCE
 /
 
-DROP TYPE t_persistent_json
+DROP TYPE t_persistent_json FORCE
 /
-DROP TYPE t_transient_json
+DROP TYPE t_transient_json FORCE
 /
 
-DROP TYPE t_json_filter
+DROP TYPE t_json_filter FORCE
 /
-DROP PACKAGE json_filters
+DROP PACKAGE json_filters 
 /
-DROP TYPE t_json_properties
+DROP TYPE t_json_properties FORCE
 /
-DROP TYPE t_json_property
+DROP TYPE t_json_property FORCE
 /
 
-DROP TYPE t_json
+DROP TYPE t_json FORCE
 /
 
-DROP TYPE t_json_builder
+DROP TYPE t_json_builder FORCE
 /
 DROP PACKAGE json_builders
 /
@@ -66,28 +66,28 @@ DROP FUNCTION to_index
 DROP PACKAGE json_parser
 /
 
-DROP TYPE t_json_mismatches
+DROP TYPE t_json_mismatches FORCE
 /
-DROP TYPE t_json_mismatch
+DROP TYPE t_json_mismatch FORCE
 /
 
-DROP TYPE t_20_value_table
+DROP TYPE t_20_value_table FORCE
+/ 
+DROP TYPE t_15_value_table FORCE
 /
-DROP TYPE t_15_value_table
+DROP TYPE t_10_value_table FORCE
 /
-DROP TYPE t_10_value_table
-/
-DROP TYPE t_5_value_table
+DROP TYPE t_5_value_table FORCE
 /
 
-DROP TYPE t_20_value_row
+DROP TYPE t_20_value_row FORCE
 /
-DROP TYPE t_15_value_row
+DROP TYPE t_15_value_row FORCE
 /
-DROP TYPE t_10_value_row
+DROP TYPE t_10_value_row FORCE
 /
-DROP TYPE t_5_value_row
+DROP TYPE t_5_value_row FORCE
 /
 
-DROP TYPE bind
+DROP TYPE bind FORCE
 /
diff --git a/src/indexes/jsvl_i3.idx b/src/indexes/jsvl_i3.idx
@@ -14,4 +14,4 @@
     limitations under the License.
 */
 
-CREATE INDEX jsvl_i3 ON json_values(UPPER(TRIM(value)))
+CREATE INDEX jsvl_i3 ON json_values(UPPER(TRIM(SUBSTR(value, 1, 1000))));
diff --git a/src/packages/json_parser.pkb b/src/packages/json_parser.pkb
@@ -16,8 +16,6 @@ CREATE OR REPLACE PACKAGE BODY json_parser IS
         limitations under the License.
     */
 
-    TYPE t_chars IS TABLE OF CHAR;
-
     PROCEDURE register_messages IS
     BEGIN
         default_message_resolver.register_message('JSN-00001', 'Unexpected character ":1"!');
@@ -30,14 +28,14 @@ CREATE OR REPLACE PACKAGE BODY json_parser IS
     RETURN t_varchars IS
         
         v_state VARCHAR2(30);
-        v_value VARCHAR2(4000);
+        v_value json_values.value%TYPE; -- If EXTENDED VARCHAR2 max. size is enabled, this will be up to 32766!
         v_name BOOLEAN;
         v_character_code VARCHAR2(4);
         
         v_context_stack t_varchars;
         v_element_i_stack t_numbers;
         
-        v_string VARCHAR2(32000);
+        v_string VARCHAR2(32767);
         v_char CHAR;
         
         v_parse_events t_varchars;
diff --git a/src/tables/json_values.tab b/src/tables/json_values.tab
@@ -19,7 +19,7 @@ CREATE TABLE json_values (
     parent_id NUMBER,
     type CHAR,
     name VARCHAR2(4000),
-    value VARCHAR2(4000),
+    value VARCHAR2(32766),
     locked CHAR,
     CONSTRAINT jsvl_pk PRIMARY KEY(id),
     CONSTRAINT jsvl_jsvl_fk FOREIGN KEY(parent_id) REFERENCES json_values(id) ON DELETE CASCADE
diff --git a/src/types/t_10_value_row.tps b/src/types/t_10_value_row.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_10_value_row IS OBJECT (
+CREATE OR REPLACE TYPE t_10_value_row FORCE IS OBJECT (
     value_1 VARCHAR2(4000),
     value_2 VARCHAR2(4000),
     value_3 VARCHAR2(4000),
diff --git a/src/types/t_10_value_table.tps b/src/types/t_10_value_table.tps
@@ -1,2 +1,2 @@
-CREATE OR REPLACE TYPE t_10_value_table IS
+CREATE OR REPLACE TYPE t_10_value_table FORCE IS
 TABLE OF t_10_value_row
diff --git a/src/types/t_15_value_row.tps b/src/types/t_15_value_row.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_15_value_row IS OBJECT (
+CREATE OR REPLACE TYPE t_15_value_row FORCE IS OBJECT (
     value_1 VARCHAR2(4000),
     value_2 VARCHAR2(4000),
     value_3 VARCHAR2(4000),
diff --git a/src/types/t_15_value_table.tps b/src/types/t_15_value_table.tps
@@ -1,2 +1,2 @@
-CREATE OR REPLACE TYPE t_15_value_table IS
+CREATE OR REPLACE TYPE t_15_value_table FORCE IS
 TABLE OF t_15_value_row
diff --git a/src/types/t_20_value_row.tps b/src/types/t_20_value_row.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_20_value_row IS OBJECT (
+CREATE OR REPLACE TYPE t_20_value_row FORCE IS OBJECT (
     value_1 VARCHAR2(4000),
     value_2 VARCHAR2(4000),
     value_3 VARCHAR2(4000),
diff --git a/src/types/t_20_value_table.tps b/src/types/t_20_value_table.tps
@@ -1,2 +1,2 @@
-CREATE OR REPLACE TYPE t_20_value_table IS
+CREATE OR REPLACE TYPE t_20_value_table FORCE IS
 TABLE OF t_20_value_row
diff --git a/src/types/t_5_value_row.tps b/src/types/t_5_value_row.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_5_value_row IS OBJECT (
+CREATE OR REPLACE TYPE t_5_value_row FORCE IS OBJECT (
     value_1 VARCHAR2(4000),
     value_2 VARCHAR2(4000),
     value_3 VARCHAR2(4000),
diff --git a/src/types/t_5_value_table.tps b/src/types/t_5_value_table.tps
@@ -1,2 +1,2 @@
-CREATE OR REPLACE TYPE t_5_value_table IS
+CREATE OR REPLACE TYPE t_5_value_table FORCE IS
 TABLE OF t_5_value_row
diff --git a/src/types/t_json.tps b/src/types/t_json.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_json IS OBJECT (
+CREATE OR REPLACE TYPE t_json FORCE IS OBJECT (
 
     /* 
         Copyright 2018 Sergejs Vinniks
diff --git a/src/types/t_json_builder.tps b/src/types/t_json_builder.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_json_builder IS OBJECT (
+CREATE OR REPLACE TYPE t_json_builder FORCE IS OBJECT (
 
     /* 
         Copyright 2018 Sergejs Vinniks
diff --git a/src/types/t_json_filter.tps b/src/types/t_json_filter.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_json_filter IS OBJECT (
+CREATE OR REPLACE TYPE t_json_filter FORCE IS OBJECT (
 
     /* 
         Copyright 2018 Sergejs Vinniks
diff --git a/src/types/t_json_mismatch.tps b/src/types/t_json_mismatch.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_json_mismatch IS OBJECT (
+CREATE OR REPLACE TYPE t_json_mismatch FORCE IS OBJECT (
     path t_varchars,
     mismatch VARCHAR2(2)
 )
diff --git a/src/types/t_json_mismatches.tps b/src/types/t_json_mismatches.tps
@@ -1 +1 @@
-CREATE OR REPLACE TYPE t_json_mismatches IS TABLE OF t_json_mismatch    
+CREATE OR REPLACE TYPE t_json_mismatches FORCE IS TABLE OF t_json_mismatch    
diff --git a/src/types/t_json_properties.tps b/src/types/t_json_properties.tps
@@ -14,5 +14,5 @@
     limitations under the License.
 */
 
-CREATE OR REPLACE TYPE t_json_properties IS
+CREATE OR REPLACE TYPE t_json_properties FORCE IS
 TABLE OF t_json_property
diff --git a/src/types/t_json_property.tps b/src/types/t_json_property.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_json_property IS OBJECT (
+CREATE OR REPLACE TYPE t_json_property FORCE IS OBJECT (
 
     /* 
         Copyright 2018 Sergejs Vinniks
diff --git a/src/types/t_json_table.tps b/src/types/t_json_table.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_json_table IS OBJECT (
+CREATE OR REPLACE TYPE t_json_table FORCE IS OBJECT (
 
     /* 
         Copyright 2018 Sergejs Vinniks
diff --git a/src/types/t_persistent_json.tps b/src/types/t_persistent_json.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_persistent_json UNDER t_json (
+CREATE OR REPLACE TYPE t_persistent_json FORCE UNDER t_json (
 
     /* 
         Copyright 2018 Sergejs Vinniks
diff --git a/src/types/t_persistent_json_table.tps b/src/types/t_persistent_json_table.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_persistent_json_table UNDER t_json_table (
+CREATE OR REPLACE TYPE t_persistent_json_table FORCE UNDER t_json_table (
 
     /* 
         Copyright 2018 Sergejs Vinniks
diff --git a/src/types/t_transient_json.tps b/src/types/t_transient_json.tps
@@ -1,4 +1,4 @@
-CREATE OR REPLACE TYPE t_transient_json UNDER t_json (
+CREATE OR REPLACE TYPE t_transient_json FORCE UNDER t_json (
 
     /* 
         Copyright 2018 Sergejs Vinniks
diff --git a/test/persistent_json_store/get_query_statement.js b/test/persistent_json_store/get_query_statement.js

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,6 @@`
`40`	`40`	`@@types/t_json_mismatches.tps`
`41`	`41`	`/`
`42`	`42`
`43`		`-@@packages/json_parser.pks`
`44`		`-/`
`45`		`-@@packages/json_parser.pkb`
`46`		`-/`
`47`		`-`
`48`	`43`	`@@functions/to_index.fnc`
`49`	`44`	`/`
`50`	`45`
`@@ -61,6 +56,11 @@`
`61`	`56`	`@@data/json_values.sql`
`62`	`57`	`/`
`63`	`58`
	`59`	`+@@packages/json_parser.pks`
	`60`	`+/`
	`61`	`+@@packages/json_parser.pkb`
	`62`	`+/`
	`63`	`+`
`64`	`64`	`@@packages/json_core.pks`
`65`	`65`	`/`
`66`	`66`	`@@packages/json_core.pkb`
Original file line number	Diff line number	Diff line change
`@@ -19,29 +19,29 @@ DROP PACKAGE json_store`
`19`	`19`
`20`	`20`	`DROP FUNCTION persistent_json_table`
`21`	`21`	`/`
`22`		`-DROP TYPE t_persistent_json_table`
	`22`	`+DROP TYPE t_persistent_json_table FORCE`
`23`	`23`	`/`
`24`		`-DROP TYPE t_json_table`
	`24`	`+DROP TYPE t_json_table FORCE`
`25`	`25`	`/`
`26`	`26`
`27`		`-DROP TYPE t_persistent_json`
	`27`	`+DROP TYPE t_persistent_json FORCE`
`28`	`28`	`/`
`29`		`-DROP TYPE t_transient_json`
	`29`	`+DROP TYPE t_transient_json FORCE`
`30`	`30`	`/`
`31`	`31`
`32`		`-DROP TYPE t_json_filter`
	`32`	`+DROP TYPE t_json_filter FORCE`
`33`	`33`	`/`
`34`		`-DROP PACKAGE json_filters`
	`34`	`+DROP PACKAGE json_filters`
`35`	`35`	`/`
`36`		`-DROP TYPE t_json_properties`
	`36`	`+DROP TYPE t_json_properties FORCE`
`37`	`37`	`/`
`38`		`-DROP TYPE t_json_property`
	`38`	`+DROP TYPE t_json_property FORCE`
`39`	`39`	`/`
`40`	`40`
`41`		`-DROP TYPE t_json`
	`41`	`+DROP TYPE t_json FORCE`
`42`	`42`	`/`
`43`	`43`
`44`		`-DROP TYPE t_json_builder`
	`44`	`+DROP TYPE t_json_builder FORCE`
`45`	`45`	`/`
`46`	`46`	`DROP PACKAGE json_builders`
`47`	`47`	`/`
`@@ -66,28 +66,28 @@ DROP FUNCTION to_index`
`66`	`66`	`DROP PACKAGE json_parser`
`67`	`67`	`/`
`68`	`68`
`69`		`-DROP TYPE t_json_mismatches`
	`69`	`+DROP TYPE t_json_mismatches FORCE`
`70`	`70`	`/`
`71`		`-DROP TYPE t_json_mismatch`
	`71`	`+DROP TYPE t_json_mismatch FORCE`
`72`	`72`	`/`
`73`	`73`
`74`		`-DROP TYPE t_20_value_table`
	`74`	`+DROP TYPE t_20_value_table FORCE`
	`75`	`+/`
	`76`	`+DROP TYPE t_15_value_table FORCE`
`75`	`77`	`/`
`76`		`-DROP TYPE t_15_value_table`
	`78`	`+DROP TYPE t_10_value_table FORCE`
`77`	`79`	`/`
`78`		`-DROP TYPE t_10_value_table`
`79`		`-/`
`80`		`-DROP TYPE t_5_value_table`
	`80`	`+DROP TYPE t_5_value_table FORCE`
`81`	`81`	`/`
`82`	`82`
`83`		`-DROP TYPE t_20_value_row`
	`83`	`+DROP TYPE t_20_value_row FORCE`
`84`	`84`	`/`
`85`		`-DROP TYPE t_15_value_row`
	`85`	`+DROP TYPE t_15_value_row FORCE`
`86`	`86`	`/`
`87`		`-DROP TYPE t_10_value_row`
	`87`	`+DROP TYPE t_10_value_row FORCE`
`88`	`88`	`/`
`89`		`-DROP TYPE t_5_value_row`
	`89`	`+DROP TYPE t_5_value_row FORCE`
`90`	`90`	`/`
`91`	`91`
`92`		`-DROP TYPE bind`
	`92`	`+DROP TYPE bind FORCE`
`93`	`93`	`/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CREATE OR REPLACE TYPE t_10_value_row IS OBJECT (`
	`1`	`+CREATE OR REPLACE TYPE t_10_value_row FORCE IS OBJECT (`
`2`	`2`	`value_1 VARCHAR2(4000),`
`3`	`3`	`value_2 VARCHAR2(4000),`
`4`	`4`	`value_3 VARCHAR2(4000),`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-CREATE OR REPLACE TYPE t_10_value_table IS`
	`1`	`+CREATE OR REPLACE TYPE t_10_value_table FORCE IS`
`2`	`2`	`TABLE OF t_10_value_row`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CREATE OR REPLACE TYPE t_15_value_row IS OBJECT (`
	`1`	`+CREATE OR REPLACE TYPE t_15_value_row FORCE IS OBJECT (`
`2`	`2`	`value_1 VARCHAR2(4000),`
`3`	`3`	`value_2 VARCHAR2(4000),`
`4`	`4`	`value_3 VARCHAR2(4000),`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-CREATE OR REPLACE TYPE t_15_value_table IS`
	`1`	`+CREATE OR REPLACE TYPE t_15_value_table FORCE IS`
`2`	`2`	`TABLE OF t_15_value_row`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CREATE OR REPLACE TYPE t_20_value_row IS OBJECT (`
	`1`	`+CREATE OR REPLACE TYPE t_20_value_row FORCE IS OBJECT (`
`2`	`2`	`value_1 VARCHAR2(4000),`
`3`	`3`	`value_2 VARCHAR2(4000),`
`4`	`4`	`value_3 VARCHAR2(4000),`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-CREATE OR REPLACE TYPE t_20_value_table IS`
	`1`	`+CREATE OR REPLACE TYPE t_20_value_table FORCE IS`
`2`	`2`	`TABLE OF t_20_value_row`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CREATE OR REPLACE TYPE t_5_value_row IS OBJECT (`
	`1`	`+CREATE OR REPLACE TYPE t_5_value_row FORCE IS OBJECT (`
`2`	`2`	`value_1 VARCHAR2(4000),`
`3`	`3`	`value_2 VARCHAR2(4000),`
`4`	`4`	`value_3 VARCHAR2(4000),`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-CREATE OR REPLACE TYPE t_5_value_table IS`
	`1`	`+CREATE OR REPLACE TYPE t_5_value_table FORCE IS`
`2`	`2`	`TABLE OF t_5_value_row`