don't print FETCH results on no-data-found

gsauthof · Jul 3, 2013 · 8e35206 · 8e35206
1 parent 67bed6e
commit 8e35206
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 45 deletions.
diff --git a/modtest/ref/gory b/modtest/ref/gory
@@ -778,15 +778,6 @@ Iterations: 1 (of 1)
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 SQL-Code: 1403, ORA-01403: no data found (select str ,n  from example_tbl where n<:b0 order by n            )
 
-Iterations: 1 (of 1)
-  Iteration: 0
-    OUT paramter (a=0)
-      Type: STRING (97), Length: 6, Size: 0, Ind -1
-      Value: |NULL|
-    OUT paramter (a=1)
-      Type: INT (3), Length: 4, Size: 0, Ind -1
-      Value: |NULL|
----------------------------------------------------------------------------
 ===========================================================================
 stmt # 25, type CLOSE (15), line 320, #para 0 (in 0) (offset 579)   (foff: 0)
 ---------------------------------------------------------------------------
@@ -1060,22 +1051,6 @@ Iterations: 1 (of 4)
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 SQL-Code: 1403, ORA-01403: no data found (select str ,n  from example_tbl where n<:b0 order by n            )
 
-Iterations: 2 (of 4)
-  Iteration: 0
-    OUT paramter (a=0)
-      Type: STRING0 (5), Length: 32, Size: 36, Ind -1
-      Value: |NULL|
-    OUT paramter (a=1)
-      Type: INT (3), Length: 4, Size: 36, Ind -1
-      Value: |NULL|
-  Iteration: 1
-    OUT paramter (a=0)
-      Type: STRING0 (5), Length: 32, Size: 36, Ind -1
-      Value: |NULL|
-    OUT paramter (a=1)
-      Type: INT (3), Length: 4, Size: 36, Ind -1
-      Value: |NULL|
----------------------------------------------------------------------------
 ===========================================================================
 stmt # 28, type CLOSE (15), line 419, #para 0 (in 0) (offset 858)   (foff: 0)
 ---------------------------------------------------------------------------
@@ -1210,15 +1185,6 @@ Iterations: 1 (of 4)
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 SQL-Code: 1403, ORA-01403: no data found (SELECT str, n FROM example_tbl WHERE n < :x ORDER BY n)
 
-Iterations: 1 (of 4)
-  Iteration: 0
-    OUT paramter (a=0)
-      Type: STRING0 (5), Length: 32, Size: 36, Ind -1
-      Value: |NULL|
-    OUT paramter (a=1)
-      Type: INT (3), Length: 4, Size: 36, Ind -1
-      Value: |NULL|
----------------------------------------------------------------------------
 ===========================================================================
 stmt # 31, type CLOSE (15), line 482, #para 0 (in 0) (offset 991)   (foff: 0)
 ---------------------------------------------------------------------------

diff --git a/modtest/ref/sql b/modtest/ref/sql
@@ -449,8 +449,6 @@ select str ,n  from example_tbl where n<5 order by n            ;
 -- example/main.pc:314
 -- Pseudo-SQL: FETCH
 -- PREFETCH=1 (# of prefetched rows)
-( NULL, NULL );
--- ---------------------------------------------------------------------------
 
 
 -- ###########################################################################
@@ -608,9 +606,6 @@ select str ,n  from example_tbl where n<6 order by n            ;
 -- example/main.pc:406
 -- Pseudo-SQL: FETCH
 -- PREFETCH=1 (# of prefetched rows)
-( NULL, NULL );
-( NULL, NULL );
--- ---------------------------------------------------------------------------
 
 
 -- ###########################################################################
@@ -726,8 +721,6 @@ DELETE FROM example_tbl WHERE n = 4;
 -- example/main.pc:468
 -- Pseudo-SQL: FETCH
 -- PREFETCH=1 (# of prefetched rows)
-( NULL, NULL );
--- ---------------------------------------------------------------------------
 
 
 -- ###########################################################################

diff --git a/prettyprint.c b/prettyprint.c
@@ -214,6 +214,11 @@ int pp_sql(const Statement *stmt, void *user_ptr)
   }
   s->tokens_pos = 0;
   SQL_Token *i = s->tokens + s->tokens_pos;
+
+  // don't print (possibly) tons of NULL fetch results
+  if (stmt->type == FETCH && (stmt->errorcode == 1403 || stmt->errorcode == 100))
+    return 0;
+
   if (s->tokens_pos < s->tokens_size && i->begin && !i->host_var) {
     tprintf("%.*s", (int) (i->end - i->begin), i->begin);
     ++s->tokens_pos;

diff --git a/wrap.c b/wrap.c
@@ -1649,10 +1649,11 @@ static int pp_sql_after(const sqlexd *d, Statement *stmt,
           state.callbacks[callback_nr].user_ptr);
   }
 
-  // now done in pp_para
-  //if (!stmt->errorcode || stmt->errorcode == 1403 || stmt->errorcode == 100) {
-    pp_para(d, false, stmt, callback_nr);
-  //}
+  // don't print (possibly) tons of NULL fetch results
+  if (stmt->type == FETCH && (stmt->errorcode == 1403 || stmt->errorcode == 100))
+    return 0;
+
+  pp_para(d, false, stmt, callback_nr);
 
   if (state.callbacks[callback_nr].after_end_fn) {
     int ret = state.callbacks[callback_nr]