add test

Author: Guillem

canal/sync.go

@@ -324,16 +324,19 @@ func (c *Canal) WaitUntilPos(pos mysql.Position, timeout time.Duration) error {
 	}
 }
 
-func (c *Canal) getShowBinaryLogQuery() string {
-	switch c.cfg.Flavor {
+func getShowBinaryLogQuery(flavor, serverVersion string) string {
+	switch flavor {
 	case mysql.MariaDBFlavor:
 		// Source: https://mariadb.com/kb/en/show-binlog-status/#:~:text=SHOW%20BINLOG%20STATUS%20%2D%2D-,From%20MariaDB%2010.5.2,-Description
-		if eq, err := c.conn.CompareServerVersion("10.5.2"); (err == nil) && (eq >= 0) {
+
+		eq, err := mysql.CompareServerVersions(serverVersion, "10.5.2")
+		if (err == nil) && (eq >= 0) {
 			return "SHOW BINLOG STATUS"
 		}
 	case mysql.MySQLFlavor:
 		// Source: https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-0.html#:~:text=AND%20GTIDS)%3B-,SHOW%20MASTER%20STATUS,-(SHOW%20BINARY
-		if eq, err := c.conn.CompareServerVersion("8.4.0"); (err == nil) && (eq >= 0) {
+		eq, err := mysql.CompareServerVersions(serverVersion, "8.4.0")
+		if (err == nil) && (eq >= 0) {
 			return "SHOW BINARY LOG STATUS"
 		}
 	}
@@ -342,7 +345,7 @@ func (c *Canal) getShowBinaryLogQuery() string {
 }
 
 func (c *Canal) GetMasterPos() (mysql.Position, error) {
-	query := c.getShowBinaryLogQuery()
+	query := getShowBinaryLogQuery(c.cfg.Flavor, c.conn.GetServerVersion())
 
 	rr, err := c.Execute(query)
 	if err != nil {

canal/sync_test.go

@@ -0,0 +1,31 @@
+package canal
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetShowBinaryLogQuery(t *testing.T) {
+	tests := []struct {
+		flavor        string
+		serverVersion string
+		expected      string
+	}{
+		{flavor: "mariadb", serverVersion: "10.5.2", expected: "SHOW BINLOG STATUS"},
+		{flavor: "mariadb", serverVersion: "10.6.0", expected: "SHOW BINLOG STATUS"},
+		{flavor: "mariadb", serverVersion: "10.4.0", expected: "SHOW MASTER STATUS"},
+		{flavor: "mysql", serverVersion: "8.4.0", expected: "SHOW BINARY LOG STATUS"},
+		{flavor: "mysql", serverVersion: "8.4.1", expected: "SHOW BINARY LOG STATUS"},
+		{flavor: "mysql", serverVersion: "8.0.33", expected: "SHOW MASTER STATUS"},
+		{flavor: "mysql", serverVersion: "5.7.41", expected: "SHOW MASTER STATUS"},
+		{flavor: "other", serverVersion: "1.0.0", expected: "SHOW MASTER STATUS"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.flavor+"_"+tt.serverVersion, func(t *testing.T) {
+			got := getShowBinaryLogQuery(tt.flavor, tt.serverVersion)
+			require.Equal(t, tt.expected, got)
+		})
+	}
+}