diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml index c849afc30..8b2fb8234 100644 --- a/sqlTranslate/.idea/workspace.xml +++ b/sqlTranslate/.idea/workspace.xml @@ -4,18 +4,11 @@ - @@ -496,7 +488,8 @@ - diff --git a/sqlTranslate/src/main/java/Document/Commit,rollback,execute in Oracle b/sqlTranslate/src/main/java/Document/Commit,rollback,execute in Oracle new file mode 100644 index 000000000..c96ea33fd --- /dev/null +++ b/sqlTranslate/src/main/java/Document/Commit,rollback,execute in Oracle @@ -0,0 +1,14 @@ +BEGIN + -- some ddl sql + INSERT INTO my_table (id, value) VALUES (1, 'test'); + + -- Commit + COMMIT; + + -- Failed + ROLLBACK; +END; +/ + +EXECUTE: EXEC my_procedure('some value'); + | EXECUTE IMMEDIATE 'INSERT INTO my_table (id, name) VALUES (1, ''John'')'; \ No newline at end of file diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist index 25611b338..9cc0476a3 100644 --- a/sqlTranslate/src/main/java/Document/Todolist +++ b/sqlTranslate/src/main/java/Document/Todolist @@ -23,5 +23,5 @@ Object  table 1  view 1  function *** - procedure *** + procedure 1  trigger **** \ No newline at end of file diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java index cda8db868..6f63c9604 100644 --- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java +++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java @@ -36,7 +36,7 @@ public class OracleLexer { // Exception , "EXCEPTION", "SQLERRM", "ZERO_DIVIDE", "INVALID_NUMBER", "OTHERS" // Procedure - , "PROCEDURE", "IS", "IN", "OUT", "$$" + , "PROCEDURE", "IS", "IN", "OUT", "$$", "COMMIT", "ROLLBACK", "EXEC", "EXECUTE" }; private static final Pattern TOKEN_PATTERN = Pattern.compile( "(NUMBER\\(.*?\\))|" + // NUMBER() function