fix: ExpectBegin TxOptions check uses && instead of ||

sqlmock.go

@@ -254,8 +254,8 @@ func (c *sqlmock) begin(opts driver.TxOptions) (*ExpectedBegin, error) {
 	}
 	defer expected.Unlock()
 	if expected.txOpts != nil &&
-		expected.txOpts.Isolation != opts.Isolation &&
-		expected.txOpts.ReadOnly != opts.ReadOnly {
+		(expected.txOpts.Isolation != opts.Isolation ||
+			expected.txOpts.ReadOnly != opts.ReadOnly) {
 		return nil, fmt.Errorf("expected transaction options do not match: %+v, got: %+v", expected.txOpts, opts)
 	}
 

sqlmock_go18_test.go

@@ -380,7 +380,7 @@ func TestContextBeginWithTxOptions(t *testing.T) {
 		cancel()
 	}()
 
-	_, err = db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelReadCommitted, ReadOnly: false})
+	_, err = db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelReadCommitted, ReadOnly: true})
 	if err != nil {
 		t.Errorf("error was not expected, but got: %v", err)
 	}
@@ -420,6 +420,52 @@ func TestContextBeginWithTxOptionsMismatch(t *testing.T) {
 	}
 }
 
+func TestContextBeginWithTxOptionsReadOnlyMismatch(t *testing.T) {
+	t.Parallel()
+	db, mock, err := New()
+	if err != nil {
+		t.Errorf("an error '%s' was not expected when opening a stub database connection", err)
+	}
+	defer db.Close()
+
+	mock.ExpectBegin().WithTxOptions(sql.TxOptions{
+		Isolation: sql.LevelReadCommitted,
+		ReadOnly:  true,
+	})
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	// Isolation matches, but ReadOnly does not. Should still error.
+	_, err = db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelReadCommitted, ReadOnly: false})
+	if err == nil {
+		t.Error("error was expected on ReadOnly mismatch, but there was none")
+	}
+}
+
+func TestContextBeginWithTxOptionsIsolationMismatch(t *testing.T) {
+	t.Parallel()
+	db, mock, err := New()
+	if err != nil {
+		t.Errorf("an error '%s' was not expected when opening a stub database connection", err)
+	}
+	defer db.Close()
+
+	mock.ExpectBegin().WithTxOptions(sql.TxOptions{
+		Isolation: sql.LevelReadCommitted,
+		ReadOnly:  true,
+	})
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	// ReadOnly matches, but Isolation does not. Should still error.
+	_, err = db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelSerializable, ReadOnly: true})
+	if err == nil {
+		t.Error("error was expected on Isolation mismatch, but there was none")
+	}
+}
+
 func TestContextPrepareCancel(t *testing.T) {
 	t.Parallel()
 	db, mock, err := New()