new in range value

Author: James Cor

go/libraries/doltcore/merge/merge_prolly_rows.go

@@ -1747,7 +1747,7 @@ func convertValueToNewType(ctx *sql.Context, value interface{}, newTypeInfo type
 	if err != nil {
 		return nil, err
 	}
-	if !inRange {
+	if inRange != sql.InRange {
 		return nil, fmt.Errorf("out of range conversion for value %v to type %s", value, newTypeInfo.String())
 	}
 	return newValue, nil

go/libraries/doltcore/sqle/dtables/prolly_row_conv.go

@@ -139,11 +139,11 @@ func (c ProllyRowConverter) putFields(ctx context.Context, tup val.Tuple, proj v
 				c.warnFn(rowconv.DatatypeCoercionFailureWarningCode, rowconv.DatatypeCoercionFailureWarning, col.Name)
 				dstRow[j] = nil
 				err = nil
-			} else if !inRange {
-				c.warnFn(rowconv.TruncatedOutOfRangeValueWarningCode, rowconv.TruncatedOutOfRangeValueWarning, t, f)
-				dstRow[j] = nil
 			} else if err != nil {
 				return err
+			} else if inRange != sql.InRange && c.warnFn != nil {
+				c.warnFn(rowconv.TruncatedOutOfRangeValueWarningCode, rowconv.TruncatedOutOfRangeValueWarning, t, f)
+				dstRow[j] = nil
 			}
 		} else {
 			dstRow[j] = f

go/libraries/doltcore/sqle/index/dolt_index.go

@@ -1407,11 +1407,14 @@ func getRangeCutValue(ctx context.Context, cut sql.MySQLRangeCut, typ sql.Type)
 	if _, ok := cut.(sql.AboveNull); ok {
 		return nil, nil
 	}
-	ret, oob, err := typ.Convert(ctx, sql.GetMySQLRangeCutKey(cut))
-	if oob == sql.OutOfRange {
+	ret, inRange, err := typ.Convert(ctx, sql.GetMySQLRangeCutKey(cut))
+	if err != nil {
+		return nil, err
+	}
+	if inRange != sql.InRange {
 		return ret, nil
 	}
-	return ret, err
+	return ret, nil
 }
 
 // DropTrailingAllColumnExprs returns the Range with any |AllColumnExprs| at the end of it removed.

go/libraries/doltcore/sqle/tables.go

@@ -169,46 +169,46 @@ func (t *DoltTable) LookupForExpressions(ctx *sql.Context, exprs ...sql.Expressi
 		dbState.SessionCache().CacheStrictLookup(schKey, lookups)
 	}
 
+	cols := schCols.GetColumns()
 	for _, lookup := range lookups {
-		if lookup.Cols.Intersection(colset).Len() == lookup.Cols.Len() {
-			// (1) assign lookup columns to range expressions in the appropriate
-			// order for the given lookup.
-			// (2) aggregate the unused expressions into the return filter.
-			rb := sql.NewEqualityIndexBuilder(lookup.Idx)
-			for _, c2 := range lookupCols {
-				var matched bool
-				var matchIdx int
-				for i, ord := range lookup.Ordinals {
-					// the ordinals redirection accounts for index
-					// columns not in schema order
-					idx := ord - 1
-					c := schCols.GetColumns()[idx]
-					if strings.EqualFold(c2.Col, c.Name) {
-						matched = true
-						matchIdx = i
-						break
-					}
-				}
-				if matched {
-					if err := rb.AddEquality(ctx, matchIdx, c2.Lit.Value()); err != nil {
-						return sql.IndexLookup{}, nil, nil, false, nil
-					}
+		// Every column must be specified in search
+		if lookup.Cols.Intersection(colset).Len() != lookup.Cols.Len() {
+			continue
+		}
+		// (1) assign lookup columns to range expressions in the appropriate order for the given lookup.
+		// (2) aggregate the unused expressions into the return filter.
+		rb := sql.NewEqualityIndexBuilder(lookup.Idx)
+		for _, c2 := range lookupCols {
+			matchIdx := -1
+			for i, ord := range lookup.Ordinals {
+				// the ordinals redirection accounts for index
+				// columns not in schema order
+				idx := ord - 1
+				c := cols[idx]
+				if strings.EqualFold(c2.Col, c.Name) {
+					matchIdx = i
+					break
 				}
-				if !matched || !expression.PreciseComparison(c2.Eq) {
-					if leftoverExpr == nil {
-						leftoverExpr = c2.Eq
-					} else {
-						leftoverExpr = expression.NewAnd(leftoverExpr, c2.Eq)
-					}
+			}
+			if matchIdx != -1 {
+				if err = rb.AddEquality(ctx, matchIdx, c2.Lit.Value()); err != nil {
+					return sql.IndexLookup{}, nil, nil, false, nil
 				}
+				continue
 			}
-			ret, err := rb.Build(ctx)
-			if err != nil {
-				return sql.IndexLookup{}, nil, nil, false, err
+			if leftoverExpr == nil {
+				leftoverExpr = c2.Eq
+			} else {
+				leftoverExpr = expression.NewAnd(leftoverExpr, c2.Eq)
 			}
+		}
 
-			return ret, lookup.Fds, leftoverExpr, true, nil
+		var ret sql.IndexLookup
+		ret, err = rb.Build(ctx)
+		if err != nil {
+			return sql.IndexLookup{}, nil, nil, false, err
 		}
+		return ret, lookup.Fds, leftoverExpr, true, nil
 	}
 
 	return sql.IndexLookup{}, nil, nil, false, nil