Add db_stored_procedure where target not like 'com.cubrid.plcsql.buil…

…tin%', and reflects changes in CUBRID#669
ssihil · Dec 20, 2023 · c397fe0 · c397fe0
1 parent 5eed6a5
commit c397fe0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 31 deletions.
diff --git a/CTP/ha_repl/src/com/navercorp/cubridqa/ha_repl/Test.java b/CTP/ha_repl/src/com/navercorp/cubridqa/ha_repl/Test.java
@@ -846,7 +846,7 @@ private boolean __isDatabaseDirty() throws Exception {
 
 		StringBuffer s = new StringBuffer();
 		s.append("select 'TABLE'||':db_class' check_table, t.* from db_class t where is_system_class='NO' and upper(class_name)<>'QA_SYSTEM_TB_FLAG';");
-		s.append("select 'TABLE'||':db_stored_procedure', t.* from db_stored_procedure t; ");
+		s.append("select 'TABLE'||':db_stored_procedure', t.* from db_stored_procedure t where target not like 'com.cubrid.plcsql.builtin%'; ");
 		s.append("select 'TABLE'||':db_trig', t.* from db_trig t; ");
 		s.append("select 'TABLE'||':db_partition', t.* from db_partition t; ");
 		s.append("select 'TABLE'||':db_meth_file', t.* from db_meth_file t; ");

diff --git a/CTP/ha_repl/src/com/navercorp/cubridqa/ha_repl/migrate/LineScanner.java b/CTP/ha_repl/src/com/navercorp/cubridqa/ha_repl/migrate/LineScanner.java
@@ -41,7 +41,7 @@ void clear() {
         plcsqlNestLevel = 0;
     }
 
-    boolean isStatementComplete() {
+    boolean isStatementEnd() {
         return (state == State.STATEMENT_END);
     }
 
@@ -52,9 +52,8 @@ boolean isInPlcsqlText() {
     void scan(String line) {
 
         assert (line != null);
-        assert (state
-                != State.STATEMENT_END); // the state must be cleared to State.GENERAL before this
-        // call
+        // the state must be cleared to State.GENERAL before this call
+        assert (state != State.STATEMENT_END);
         assert ((plcsqlBeginEndBalance == 0 && plcsqlNestLevel == 0)
                 || (substate == Substate.PLCSQL_TEXT || substate == Substate.SEEN_END));
 
@@ -129,12 +128,7 @@ void scan(String line) {
                             break;
 
                         case '"':
-                            /*if (prm_get_bool_value (PRM_ID_ANSI_QUOTES) == false) {   TODO: can we see the parameter?
-                              state = State.MYSQL_QUOTE;
-                            } else*/ {
-                                state = State.DOUBLE_QUOTE_IDENTIFIER;
-                            }
-
+                            state = State.DOUBLE_QUOTE_IDENTIFIER;
                             stmtComplete = false;
                             break;
 
@@ -189,10 +183,7 @@ void scan(String line) {
                     break;
 
                 case SINGLE_QUOTE:
-                    /*if (prm_get_bool_value (PRM_ID_NO_BACKSLASH_ESCAPES) == false &&
-                          c == '\\') {      TODO: can we see the parameter?
-                        i++;
-                    } else */ if (c == '\'') {
+                    if (c == '\'') {
                         if (charAtStr(line, i + 1) == '\'') {
                             // escape by ''
                             i++;
@@ -202,20 +193,6 @@ void scan(String line) {
                     }
                     break;
 
-                case MYSQL_QUOTE:
-                    /*if (prm_get_bool_value (PRM_ID_NO_BACKSLASH_ESCAPES) == false &&
-                          c == '\\') {      TODO: can we see the parameter?
-                        i++;
-                    } else */ if (c == '"') {
-                        if (charAtStr(line, i + 1) == '"') {
-                            // escape by ""
-                            i++;
-                        } else {
-                            state = State.GENERAL;
-                        }
-                    }
-                    break;
-
                 case DOUBLE_QUOTE_IDENTIFIER:
                     if (c == '"') {
                         state = State.GENERAL;
@@ -417,7 +394,7 @@ private enum State {
         CPP_COMMENT,
         SQL_COMMENT,
         SINGLE_QUOTE,
-        MYSQL_QUOTE,
+        //MYSQL_QUOTE,
         DOUBLE_QUOTE_IDENTIFIER,
         BACKTICK_IDENTIFIER,
         BRACKET_IDENTIFIER,

diff --git a/CTP/ha_repl/src/com/navercorp/cubridqa/ha_repl/migrate/SQLFileReader.java b/CTP/ha_repl/src/com/navercorp/cubridqa/ha_repl/migrate/SQLFileReader.java
@@ -374,7 +374,6 @@ public void convert() throws IOException {
 					isMultipleLine = false;
 					shouldBeDeleted = false;
 					isDML = false;
-					lineScanner.clear();
 				}
 			} else {
 				if (isMultipleLine) {
@@ -392,6 +391,9 @@ public void convert() throws IOException {
 					isMultipleLine = true;
 				}
 			}
+			if (lineScanner.isStatementEnd()) {
+				lineScanner.clear();
+			}
 		}
 		out.flush();
 		out.close();