Sfoglia il codice sorgente

Replace case that was made invalid when error structs were exposed to conn.executeQuery for ErrUnprepared.

Nimi Wariboko Jr 11 anni fa
parent
commit
225752acef
1 ha cambiato i file con 7 aggiunte e 11 eliminazioni
  1. 7 11
      conn.go

+ 7 - 11
conn.go

@@ -399,19 +399,15 @@ func (c *Conn) executeQuery(qry *Query) *Iter {
 		return iter
 		return iter
 	case resultKeyspaceFrame:
 	case resultKeyspaceFrame:
 		return &Iter{}
 		return &Iter{}
-	case errorFrame:
-		if x.Code() == errUnprepared && len(qry.values) > 0 {
-			c.prepMu.Lock()
-			if val, ok := c.prep[qry.stmt]; ok && val != nil {
-				delete(c.prep, qry.stmt)
-				c.prepMu.Unlock()
-				return c.executeQuery(qry)
-			}
+	case RequestErrUnprepared:
+		c.prepMu.Lock()
+		if val, ok := c.prep[qry.stmt]; ok && val != nil {
+			delete(c.prep, qry.stmt)
 			c.prepMu.Unlock()
 			c.prepMu.Unlock()
-			return &Iter{err: x}
-		} else {
-			return &Iter{err: x}
+			return c.executeQuery(qry)
 		}
 		}
+		c.prepMu.Unlock()
+		return &Iter{err: x}
 	case error:
 	case error:
 		return &Iter{err: x}
 		return &Iter{err: x}
 	default:
 	default: