Merge remote-tracking branch 'origin/master' into lance6716/improve-re

# Conflicts:
#	driver/driver_test.go

Author: lance6716

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         go: [ "1.26", "1.25", "1.24" ]
-        os: [ ubuntu-latest, ubuntu-24.04, ubuntu-22.04 ]
+        os: [ ubuntu-latest, ubuntu-24.04, ubuntu-22.04, ubuntu-24.04-arm ]
     name: Tests Go ${{ matrix.go }} on ${{ matrix.os }} # This name is used in main branch protection rules
     runs-on: ${{ matrix.os }}
 

README.md

@@ -1,3 +1,5 @@
+<img src="go-mysql-logo.png" width="150px">
+
 # go-mysql
 
 A pure Go library to handle MySQL network protocol and replication as used by MySQL and MariaDB.
@@ -17,7 +19,7 @@ This library has been tested or deployed on the following operating systems and
 |------------------|--------------|-------------------|----|--------------------------------------------------------------------------------------------------------------------------------|
 | Linux            | amd64        | ✅                | ✅ | Check GitHub Actions of this project.                                                                                          |
 | Linux            | s390x        | ✅                | ✅ | A daily CI runs on an s390x VM, supported by the [IBM Z and LinuxONE Community](https://www.ibm.com/community/z/open-source/). |
-| Linux            | arm64        | ✅                | ❌ | Deployed in a production environment of a user.                                                                                |
+| Linux            | arm64        | ✅                | ✅ | Deployed in a production environment of a user.                                                                                |
 | Linux            | arm          | ✅                | ❌ | A test in CI to make sure builds for 32-bits platforms work.                                                                   |
 | FreeBSD          | amd64        | ✅                | ❌ | Sporadically tested by developers.                                                                                             |
 
@@ -350,6 +352,37 @@ func main() {
 }
 ```
 
+### Structured Connector
+
+If you prefer a structured configuration over a DSN string, you can use
+`database/sql.OpenDB` with `driver.Connector`:
+
+```go
+package main
+
+import (
+	"database/sql"
+	"net/url"
+
+	"github.com/go-mysql-org/go-mysql/driver"
+)
+
+func main() {
+	connector := driver.Connector{
+		Addr: "127.0.0.1:3306",
+		User: "root",
+		DB:   "test",
+		Params: url.Values{
+			// same option keys as the standard DSN form
+			"timeout": []string{"10s"},
+		},
+	}
+
+	db := sql.OpenDB(connector)
+	db.Close()
+}
+```
+
 ### Driver Options
 
 Configuration options can be provided by the standard DSN (Data Source Name).

canal/handler.go

@@ -3,6 +3,7 @@ package canal
 import (
 	"github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/go-mysql-org/go-mysql/replication"
+	"github.com/go-mysql-org/go-mysql/schema"
 )
 
 type EventHandler interface {
@@ -21,6 +22,9 @@ type EventHandler interface {
 	// You'll get the original executed query, with comments if present.
 	// It will be called before OnRow.
 	OnRowsQueryEvent(e *replication.RowsQueryEvent) error
+	// OnTableNotFound is called when a Rows Event references a table object
+	// that no longer exists.
+	OnTableNotFound(*replication.EventHeader, *replication.RowsEvent) error
 	String() string
 }
 
@@ -51,6 +55,11 @@ func (h *DummyEventHandler) OnRowsQueryEvent(*replication.RowsQueryEvent) error
 	return nil
 }
 
+// OnTableNotFound is called for row events for reference tables that are not found
+func (h *DummyEventHandler) OnTableNotFound(header *replication.EventHeader, e *replication.RowsEvent) error {
+	return schema.ErrTableNotExist
+}
+
 func (h *DummyEventHandler) String() string { return "DummyEventHandler" }
 
 // `SetEventHandler` registers the sync handler, you must register your

canal/sync.go

@@ -270,12 +270,15 @@ func (c *Canal) handleRowsEvent(e *replication.BinlogEvent) error {
 
 	t, err := c.GetTable(schemaName, tableName)
 	if err != nil {
-		e := errors.Cause(err)
+		cause := errors.Cause(err)
 		// ignore errors below
-		if e == ErrExcludedTable || e == schema.ErrTableNotExist || e == schema.ErrMissingTableMeta {
-			err = nil
+		if cause == ErrExcludedTable || cause == schema.ErrMissingTableMeta {
+			return nil
+		}
+		// Allow handler to decide what to do when table is missing.
+		if cause == schema.ErrTableNotExist {
+			return c.eventHandler.OnTableNotFound(e.Header, ev)
 		}
-
 		return err
 	}
 	var action string

driver/connector_test.go

@@ -0,0 +1,35 @@
+package driver
+
+import (
+	"database/sql"
+	"net/url"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestConnector_OpenDB(t *testing.T) {
+	srv := createMockServer(t)
+	defer srv.Stop()
+
+	connector := Connector{
+		Addr:     "127.0.0.1:3307",
+		User:     *testUser,
+		Password: *testPassword,
+		DB:       "test",
+		Params: url.Values{
+			// Just make sure Params are accepted when using Connector directly.
+			"timeout": []string{"1s"},
+		},
+	}
+
+	db := sql.OpenDB(connector)
+	defer db.Close()
+
+	var a uint64
+	var b string
+	err := db.QueryRow("select * from table;").Scan(&a, &b)
+	require.NoError(t, err)
+	require.EqualValues(t, 1, a)
+	require.Equal(t, "hello world", b)
+}