diff --git a/third_party/dependency/pldebugger/patch.sh b/third_party/dependency/pldebugger/patch.sh index 3e8f006df..3888ce3da 100644 --- a/third_party/dependency/pldebugger/patch.sh +++ b/third_party/dependency/pldebugger/patch.sh @@ -1,7 +1,7 @@ rm -rf pldebugger_3_0 tar xfzv pldebugger_3_0.tar.gz &> /dev/null rename ".c" ".cpp" pldebugger_3_0/*.c -file_name="huawei_pldebugger.patch" +file_name="pldebugger_3_0_patch.patch" if [ ! -f "$file_name" ]; then exit 0; fi diff --git a/third_party/dependency/pldebugger/huawei_pldebugger.patch b/third_party/dependency/pldebugger/pldebugger_3_0_patch.patch similarity index 99% rename from third_party/dependency/pldebugger/huawei_pldebugger.patch rename to third_party/dependency/pldebugger/pldebugger_3_0_patch.patch index cda960a73..6f35cbc24 100644 --- a/third_party/dependency/pldebugger/huawei_pldebugger.patch +++ b/third_party/dependency/pldebugger/pldebugger_3_0_patch.patch @@ -1486,7 +1486,7 @@ index 223ac81..d8fcf81 100644 /* in plpgsql_debugger.c */ extern void plpgsql_debugger_fini(void); diff --git plpgsql_debugger.cpp plpgsql_debugger.cpp -index df52f01..5bb0580 100644 +index df52f01..ace2806 100644 --- plpgsql_debugger.cpp +++ plpgsql_debugger.cpp @@ -24,6 +24,7 @@ @@ -1826,6 +1826,15 @@ index df52f01..5bb0580 100644 { if( strcmp( var->refname, hidden_variables[i] ) == 0 ) { +@@ -1200,7 +1281,7 @@ plpgsql_send_cur_line(ErrorContextCallback *frame) + + dbg_send( "%d:%d:%s", + func->fn_oid, +- stmt->lineno+1, ++ stmt->lineno, + #if (PG_VERSION_NUM >= 90200) + func->fn_signature + #else @@ -1244,132 +1325,126 @@ static bool isFirstStmt( PLpgSQL_stmt * stmt, PLpgSQL_function * func ) static void dbg_newstmt( PLpgSQL_execstate * estate, PLpgSQL_stmt * stmt )