修改参数列表

client/client.go

@@ -13,26 +13,26 @@ const (
 )
 
 type Client interface {
-	AutoMigrate(request *AutoMigrateRequest) error
-	AutoMigrateBatch(request *AutoMigrateBatchRequest) error
+	AutoMigrate(databaseID string, request *AutoMigrateRequest) error
+	AutoMigrateBatch(databaseID string, request *AutoMigrateBatchRequest) error
 	Transaction(databaseID string, txFunc TransactionFunc) error
-	Insert(request *InsertRequest) (string, error)
-	InsertBatch(request *InsertBatchRequest) (string, error)
-	Delete(request *DeleteRequest) (string, error)
-	DeleteBatch(request *DeleteBatchRequest) (string, error)
-	Update(request *UpdateRequest) (string, error)
-	Replay(req *ReplayRequest) (string, error)
-	QueryByWhereAndOrderBy(request *QueryByWhereAndOrderByRequest) (string, []map[string]any, int64, error)
-	CommonQuery(request *CommonQueryRequest) (string, []map[string]any, int64, error)
-	QueryByKeys(request *QueryByKeysRequest) (string, map[string]any, error)
-	CountWhere(request *CountWhereRequest) (string, int64, error)
-	CommonCount(request *CommonCountRequest) (string, int64, error)
-	EventQueryByKeys(request *EventQueryByKeysRequest) (string, []EventInfo, int64, error)
-	CommonEventQuery(request *CommonEventQueryRequest) (string, []EventInfo, int64, error)
-	CountEventByKeys(request *CountEventByKeysRequest) (string, int64, error)
-	CommonCountEvent(request *CommonCountEventRequest) (string, int64, error)
-	EventHistoryQueryByKeys(request *EventQueryByKeysRequest) (string, []EventInfo, int64, error)
-	CommonEventHistoryQuery(request *CommonEventQueryRequest) (string, []EventInfo, int64, error)
-	CountEventHistoryByKeys(request *CountEventByKeysRequest) (string, int64, error)
-	CommonCountEventHistory(request *CommonCountEventRequest) (string, int64, error)
+	Insert(databaseID string, request *InsertRequest) (string, error)
+	InsertBatch(databaseID string, request *InsertBatchRequest) (string, error)
+	Delete(databaseID string, request *DeleteRequest) (string, error)
+	DeleteBatch(databaseID string, request *DeleteBatchRequest) (string, error)
+	Update(databaseID string, request *UpdateRequest) (string, error)
+	Replay(databaseID string, request *ReplayRequest) (string, error)
+	QueryByWhereAndOrderBy(databaseID string, request *QueryByWhereAndOrderByRequest) (string, []map[string]any, int64, error)
+	CommonQuery(databaseID string, request *CommonQueryRequest) (string, []map[string]any, int64, error)
+	QueryByKeys(databaseID string, request *QueryByKeysRequest) (string, map[string]any, error)
+	CountWhere(databaseID string, request *CountWhereRequest) (string, int64, error)
+	CommonCount(databaseID string, request *CommonCountRequest) (string, int64, error)
+	EventQueryByKeys(databaseID string, request *EventQueryByKeysRequest) (string, []EventInfo, int64, error)
+	CommonEventQuery(databaseID string, request *CommonEventQueryRequest) (string, []EventInfo, int64, error)
+	CountEventByKeys(databaseID string, request *CountEventByKeysRequest) (string, int64, error)
+	CommonCountEvent(databaseID string, request *CommonCountEventRequest) (string, int64, error)
+	EventHistoryQueryByKeys(databaseID string, request *EventQueryByKeysRequest) (string, []EventInfo, int64, error)
+	CommonEventHistoryQuery(databaseID string, request *CommonEventQueryRequest) (string, []EventInfo, int64, error)
+	CountEventHistoryByKeys(databaseID string, request *CountEventByKeysRequest) (string, int64, error)
+	CommonCountEventHistory(databaseID string, request *CommonCountEventRequest) (string, int64, error)
 }

client/client_cmd_request.go

@@ -1,13 +1,11 @@
 package client
 
 type AutoMigrateRequest struct {
-	DatabaseID string
 	AutoMigrateItem
 }
 
 type AutoMigrateBatchRequest struct {
-	DatabaseID string
-	Items      []AutoMigrateItem
+	Items []AutoMigrateItem
 }
 
 type AutoMigrateItem struct {
@@ -17,7 +15,6 @@ type AutoMigrateItem struct {
 }
 
 type InsertRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	Version               string
 	KeyColumns            []string
@@ -26,9 +23,8 @@ type InsertRequest struct {
 }
 
 type InsertBatchRequest struct {
-	DatabaseID string
-	Items      []*InsertTableItem
-	UserID     string
+	Items  []*InsertTableItem
+	UserID string
 }
 
 type InsertTableItem struct {
@@ -43,7 +39,6 @@ type InsertItem struct {
 }
 
 type DeleteRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	Version               string
 	KeyValues             map[string]string
@@ -51,9 +46,8 @@ type DeleteRequest struct {
 }
 
 type DeleteBatchRequest struct {
-	DatabaseID string
-	Items      []*DeleteTableItem
-	UserID     string
+	Items  []*DeleteTableItem
+	UserID string
 }
 
 type DeleteTableItem struct {
@@ -67,7 +61,6 @@ type DeleteItem struct {
 }
 
 type UpdateRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	Version               string
 	KeyValues             map[string]string
@@ -76,7 +69,6 @@ type UpdateRequest struct {
 }
 
 type ReplayRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	Version               string
 	KeyValues             map[string]string

client/client_query_request.go

@@ -1,7 +1,6 @@
 package client
 
 type QueryByWhereAndOrderByRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	Version               string
 	Select                string
@@ -12,7 +11,6 @@ type QueryByWhereAndOrderByRequest struct {
 }
 
 type CommonQueryRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	Version               string
 	Select                string
@@ -27,7 +25,6 @@ type CommonQueryRequest struct {
 }
 
 type QueryByKeysRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	Version               string
 	Select                string
@@ -35,14 +32,12 @@ type QueryByKeysRequest struct {
 }
 
 type CountWhereRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	Version               string
 	Where                 []ColumnCompare
 }
 
 type CommonCountRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	Version               string
 	Where                 []ColumnCompare
@@ -53,7 +48,6 @@ type CommonCountRequest struct {
 }
 
 type EventQueryByKeysRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	Select                string
 	KeyValues             []string
@@ -62,7 +56,6 @@ type EventQueryByKeysRequest struct {
 }
 
 type CommonEventQueryRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	Select                string
 	KeyValues             []string
@@ -76,13 +69,11 @@ type CommonEventQueryRequest struct {
 }
 
 type CountEventByKeysRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	KeyValues             []string
 }
 
 type CommonCountEventRequest struct {
-	DatabaseID            string
 	TablePrefixWithSchema string
 	KeyValues             []string
 	Version               string

client/transaction.go

@@ -3,10 +3,10 @@ package client
 type TransactionFunc func(tx Transaction) error
 
 type Transaction interface {
-	InsertTx(request *InsertRequest) (string, error)
-	InsertBatchTx(request *InsertBatchRequest) (string, error)
-	DeleteTx(request *DeleteRequest) (string, error)
-	DeleteBatchTx(request *DeleteBatchRequest) (string, error)
-	UpdateTx(request *UpdateRequest) (string, error)
+	InsertTx(databaseID string, request *InsertRequest) (string, error)
+	InsertBatchTx(databaseID string, request *InsertBatchRequest) (string, error)
+	DeleteTx(databaseID string, request *DeleteRequest) (string, error)
+	DeleteBatchTx(databaseID string, request *DeleteBatchRequest) (string, error)
+	UpdateTx(databaseID string, request *UpdateRequest) (string, error)
 	End() error
 }

dpsv1/client.go

@@ -54,14 +54,14 @@ func DestroyClient(client *Client) error {
 	return nil
 }
 
-func (c *Client) AutoMigrate(req *client.AutoMigrateRequest) error {
+func (c *Client) AutoMigrate(databaseID string, req *client.AutoMigrateRequest) error {
 	tableModelDescribeJsonBytes, err := json.Marshal(req.TableModelDescribe)
 	if err != nil {
 		return err
 	}
 
 	_, err = c.commandServiceClient.AutoMigrate(context.Background(), &request.AutoMigrateRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		TableModelDescribe:    tableModelDescribeJsonBytes,
@@ -73,7 +73,7 @@ func (c *Client) AutoMigrate(req *client.AutoMigrateRequest) error {
 	return nil
 }
 
-func (c *Client) AutoMigrateBatch(req *client.AutoMigrateBatchRequest) error {
+func (c *Client) AutoMigrateBatch(databaseID string, req *client.AutoMigrateBatchRequest) error {
 	items := make([]*request.AutoMigrateItem, 0)
 	for _, reqItem := range req.Items {
 		tableModelDescribeJsonBytes, err := json.Marshal(reqItem.TableModelDescribe)
@@ -89,7 +89,7 @@ func (c *Client) AutoMigrateBatch(req *client.AutoMigrateBatchRequest) error {
 	}
 
 	_, err := c.commandServiceClient.AutoMigrateBatch(context.Background(), &request.AutoMigrateBatchRequest{
-		DatabaseID: req.DatabaseID,
+		DatabaseID: databaseID,
 		Items:      items,
 	})
 	if err != nil {
@@ -124,14 +124,14 @@ func (c *Client) Transaction(databaseID string, txFunc client.TransactionFunc) e
 	return nil
 }
 
-func (c *Client) Insert(req *client.InsertRequest) (string, error) {
+func (c *Client) Insert(databaseID string, req *client.InsertRequest) (string, error) {
 	tableRowJsonBytes, err := c.formTableRow(req.TableRow)
 	if err != nil {
 		return "", err
 	}
 
 	reply, err := c.commandServiceClient.Insert(context.Background(), &request.InsertRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		KeyColumns:            req.KeyColumns,
@@ -145,7 +145,7 @@ func (c *Client) Insert(req *client.InsertRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) InsertBatch(req *client.InsertBatchRequest) (string, error) {
+func (c *Client) InsertBatch(databaseID string, req *client.InsertBatchRequest) (string, error) {
 	tableItems := make([]*request.InsertTableItem, 0)
 
 	for _, reqTableItem := range req.Items {
@@ -170,7 +170,7 @@ func (c *Client) InsertBatch(req *client.InsertBatchRequest) (string, error) {
 	}
 
 	reply, err := c.commandServiceClient.InsertBatch(context.Background(), &request.InsertBatchRequest{
-		DatabaseID: req.DatabaseID,
+		DatabaseID: databaseID,
 		Items:      tableItems,
 		UserID:     req.UserID,
 	})
@@ -181,9 +181,9 @@ func (c *Client) InsertBatch(req *client.InsertBatchRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) Delete(req *client.DeleteRequest) (string, error) {
+func (c *Client) Delete(databaseID string, req *client.DeleteRequest) (string, error) {
 	reply, err := c.commandServiceClient.Delete(context.Background(), &request.DeleteRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		KeyValues:             req.KeyValues,
@@ -196,7 +196,7 @@ func (c *Client) Delete(req *client.DeleteRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) DeleteBatch(req *client.DeleteBatchRequest) (string, error) {
+func (c *Client) DeleteBatch(databaseID string, req *client.DeleteBatchRequest) (string, error) {
 	tableItems := make([]*request.DeleteTableItem, 0)
 
 	for _, reqTableItem := range req.Items {
@@ -215,7 +215,7 @@ func (c *Client) DeleteBatch(req *client.DeleteBatchRequest) (string, error) {
 	}
 
 	reply, err := c.commandServiceClient.DeleteBatch(context.Background(), &request.DeleteBatchRequest{
-		DatabaseID: req.DatabaseID,
+		DatabaseID: databaseID,
 		Items:      tableItems,
 		UserID:     req.UserID,
 	})
@@ -226,14 +226,14 @@ func (c *Client) DeleteBatch(req *client.DeleteBatchRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) Update(req *client.UpdateRequest) (string, error) {
+func (c *Client) Update(databaseID string, req *client.UpdateRequest) (string, error) {
 	newTableRowJsonByte, err := c.formTableRow(req.NewTableRow)
 	if err != nil {
 		return "", err
 	}
 
 	reply, err := c.commandServiceClient.Update(context.Background(), &request.UpdateRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		KeyValues:             req.KeyValues,
@@ -247,9 +247,9 @@ func (c *Client) Update(req *client.UpdateRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) Replay(req *client.ReplayRequest) (string, error) {
+func (c *Client) Replay(databaseID string, req *client.ReplayRequest) (string, error) {
 	reply, err := c.commandServiceClient.Replay(context.Background(), &request.ReplayRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		KeyValues:             req.KeyValues,
@@ -262,14 +262,14 @@ func (c *Client) Replay(req *client.ReplayRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) QueryByWhereAndOrderBy(req *client.QueryByWhereAndOrderByRequest) (string, []map[string]any, int64, error) {
+func (c *Client) QueryByWhereAndOrderBy(databaseID string, req *client.QueryByWhereAndOrderByRequest) (string, []map[string]any, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", nil, 0, err
 	}
 
 	reply, err := c.queryServiceClient.QueryByWhereAndOrderBy(context.Background(), &request.QueryByWhereAndOrderByRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		Select:                req.Select,
@@ -290,7 +290,7 @@ func (c *Client) QueryByWhereAndOrderBy(req *client.QueryByWhereAndOrderByReques
 	return reply.Statement, infosMap, reply.TotalCount, nil
 }
 
-func (c *Client) CommonQuery(req *client.CommonQueryRequest) (string, []map[string]any, int64, error) {
+func (c *Client) CommonQuery(databaseID string, req *client.CommonQueryRequest) (string, []map[string]any, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", nil, 0, err
@@ -307,7 +307,7 @@ func (c *Client) CommonQuery(req *client.CommonQueryRequest) (string, []map[stri
 	}
 
 	reply, err := c.queryServiceClient.CommonQuery(context.Background(), &request.CommonQueryRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		Select:                req.Select,
@@ -332,9 +332,9 @@ func (c *Client) CommonQuery(req *client.CommonQueryRequest) (string, []map[stri
 	return reply.Statement, infosMap, reply.TotalCount, nil
 }
 
-func (c *Client) QueryByKeys(req *client.QueryByKeysRequest) (string, map[string]any, error) {
+func (c *Client) QueryByKeys(databaseID string, req *client.QueryByKeysRequest) (string, map[string]any, error) {
 	reply, err := c.queryServiceClient.QueryByKeys(context.Background(), &request.QueryByKeysRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		Select:                req.Select,
@@ -352,14 +352,14 @@ func (c *Client) QueryByKeys(req *client.QueryByKeysRequest) (string, map[string
 	return reply.Statement, infoMap, nil
 }
 
-func (c *Client) CountWhere(req *client.CountWhereRequest) (string, int64, error) {
+func (c *Client) CountWhere(databaseID string, req *client.CountWhereRequest) (string, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", 0, err
 	}
 
 	reply, err := c.queryServiceClient.CountWhere(context.Background(), &request.CountWhereRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		Where:                 whereJsonBytes,
@@ -371,7 +371,7 @@ func (c *Client) CountWhere(req *client.CountWhereRequest) (string, int64, error
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) CommonCount(req *client.CommonCountRequest) (string, int64, error) {
+func (c *Client) CommonCount(databaseID string, req *client.CommonCountRequest) (string, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", 0, err
@@ -388,7 +388,7 @@ func (c *Client) CommonCount(req *client.CommonCountRequest) (string, int64, err
 	}
 
 	reply, err := c.queryServiceClient.CommonCount(context.Background(), &request.CommonCountRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		Where:                 whereJsonBytes,
@@ -404,9 +404,9 @@ func (c *Client) CommonCount(req *client.CommonCountRequest) (string, int64, err
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) EventQueryByKeys(req *client.EventQueryByKeysRequest) (string, []client.EventInfo, int64, error) {
+func (c *Client) EventQueryByKeys(databaseID string, req *client.EventQueryByKeysRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.EventQueryByKeys(context.Background(), &request.EventQueryByKeysRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Select:                req.Select,
 		KeyValues:             req.KeyValues,
@@ -420,9 +420,9 @@ func (c *Client) EventQueryByKeys(req *client.EventQueryByKeysRequest) (string,
 	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CommonEventQuery(req *client.CommonEventQueryRequest) (string, []client.EventInfo, int64, error) {
+func (c *Client) CommonEventQuery(databaseID string, req *client.CommonEventQueryRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonEventQuery(context.Background(), &request.CommonEventQueryRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Select:                req.Select,
 		KeyValues:             req.KeyValues,
@@ -441,9 +441,9 @@ func (c *Client) CommonEventQuery(req *client.CommonEventQueryRequest) (string,
 	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CountEventByKeys(req *client.CountEventByKeysRequest) (string, int64, error) {
+func (c *Client) CountEventByKeys(databaseID string, req *client.CountEventByKeysRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CountEventByKeys(context.Background(), &request.CountEventByKeysRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		KeyValues:             req.KeyValues,
 	})
@@ -454,9 +454,9 @@ func (c *Client) CountEventByKeys(req *client.CountEventByKeysRequest) (string,
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) CommonCountEvent(req *client.CommonCountEventRequest) (string, int64, error) {
+func (c *Client) CommonCountEvent(databaseID string, req *client.CommonCountEventRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonCountEvent(context.Background(), &request.CommonCountEventRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		KeyValues:             req.KeyValues,
 		Version:               req.Version,
@@ -472,9 +472,9 @@ func (c *Client) CommonCountEvent(req *client.CommonCountEventRequest) (string,
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) EventHistoryQueryByKeys(req *client.EventQueryByKeysRequest) (string, []client.EventInfo, int64, error) {
+func (c *Client) EventHistoryQueryByKeys(databaseID string, req *client.EventQueryByKeysRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.EventHistoryQueryByKeys(context.Background(), &request.EventQueryByKeysRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Select:                req.Select,
 		KeyValues:             req.KeyValues,
@@ -488,9 +488,9 @@ func (c *Client) EventHistoryQueryByKeys(req *client.EventQueryByKeysRequest) (s
 	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CommonEventHistoryQuery(req *client.CommonEventQueryRequest) (string, []client.EventInfo, int64, error) {
+func (c *Client) CommonEventHistoryQuery(databaseID string, req *client.CommonEventQueryRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonEventHistoryQuery(context.Background(), &request.CommonEventQueryRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Select:                req.Select,
 		KeyValues:             req.KeyValues,
@@ -509,9 +509,9 @@ func (c *Client) CommonEventHistoryQuery(req *client.CommonEventQueryRequest) (s
 	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CountEventHistoryByKeys(req *client.CountEventByKeysRequest) (string, int64, error) {
+func (c *Client) CountEventHistoryByKeys(databaseID string, req *client.CountEventByKeysRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CountEventHistoryByKeys(context.Background(), &request.CountEventByKeysRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		KeyValues:             req.KeyValues,
 	})
@@ -522,9 +522,9 @@ func (c *Client) CountEventHistoryByKeys(req *client.CountEventByKeysRequest) (s
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) CommonCountEventHistory(req *client.CommonCountEventRequest) (string, int64, error) {
+func (c *Client) CommonCountEventHistory(databaseID string, req *client.CommonCountEventRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonCountEventHistory(context.Background(), &request.CommonCountEventRequest{
-		DatabaseID:            req.DatabaseID,
+		DatabaseID:            databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		KeyValues:             req.KeyValues,
 		Version:               req.Version,

dpsv1/transaction.go

@@ -12,7 +12,7 @@ type Transaction struct {
 	client *Client
 }
 
-func (tx *Transaction) InsertTx(req *client.InsertRequest) (string, error) {
+func (tx *Transaction) InsertTx(databaseID string, req *client.InsertRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -32,7 +32,7 @@ func (tx *Transaction) InsertTx(req *client.InsertRequest) (string, error) {
 	err = tx.stream.Send(&request.TransactionOperation{
 		Request: &request.TransactionOperation_InsertRequest{
 			InsertRequest: &request.InsertRequest{
-				DatabaseID:            req.DatabaseID,
+				DatabaseID:            databaseID,
 				TablePrefixWithSchema: req.TablePrefixWithSchema,
 				Version:               req.Version,
 				KeyColumns:            req.KeyColumns,
@@ -52,7 +52,7 @@ func (tx *Transaction) InsertTx(req *client.InsertRequest) (string, error) {
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) InsertBatchTx(req *client.InsertBatchRequest) (string, error) {
+func (tx *Transaction) InsertBatchTx(databaseID string, req *client.InsertBatchRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -90,7 +90,7 @@ func (tx *Transaction) InsertBatchTx(req *client.InsertBatchRequest) (string, er
 	err = tx.stream.Send(&request.TransactionOperation{
 		Request: &request.TransactionOperation_InsertBatchRequest{
 			InsertBatchRequest: &request.InsertBatchRequest{
-				DatabaseID: req.DatabaseID,
+				DatabaseID: databaseID,
 				Items:      tableItems,
 				UserID:     req.UserID,
 			},
@@ -107,7 +107,7 @@ func (tx *Transaction) InsertBatchTx(req *client.InsertBatchRequest) (string, er
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) DeleteTx(req *client.DeleteRequest) (string, error) {
+func (tx *Transaction) DeleteTx(databaseID string, req *client.DeleteRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -122,7 +122,7 @@ func (tx *Transaction) DeleteTx(req *client.DeleteRequest) (string, error) {
 	err = tx.stream.Send(&request.TransactionOperation{
 		Request: &request.TransactionOperation_DeleteRequest{
 			DeleteRequest: &request.DeleteRequest{
-				DatabaseID:            req.DatabaseID,
+				DatabaseID:            databaseID,
 				TablePrefixWithSchema: req.TablePrefixWithSchema,
 				Version:               req.Version,
 				KeyValues:             req.KeyValues,
@@ -141,7 +141,7 @@ func (tx *Transaction) DeleteTx(req *client.DeleteRequest) (string, error) {
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) DeleteBatchTx(req *client.DeleteBatchRequest) (string, error) {
+func (tx *Transaction) DeleteBatchTx(databaseID string, req *client.DeleteBatchRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -173,7 +173,7 @@ func (tx *Transaction) DeleteBatchTx(req *client.DeleteBatchRequest) (string, er
 	err = tx.stream.Send(&request.TransactionOperation{
 		Request: &request.TransactionOperation_DeleteBatchRequest{
 			DeleteBatchRequest: &request.DeleteBatchRequest{
-				DatabaseID: req.DatabaseID,
+				DatabaseID: databaseID,
 				Items:      tableItems,
 				UserID:     req.UserID,
 			},
@@ -190,7 +190,7 @@ func (tx *Transaction) DeleteBatchTx(req *client.DeleteBatchRequest) (string, er
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) UpdateTx(req *client.UpdateRequest) (string, error) {
+func (tx *Transaction) UpdateTx(databaseID string, req *client.UpdateRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -210,7 +210,7 @@ func (tx *Transaction) UpdateTx(req *client.UpdateRequest) (string, error) {
 	err = tx.stream.Send(&request.TransactionOperation{
 		Request: &request.TransactionOperation_UpdateRequest{
 			UpdateRequest: &request.UpdateRequest{
-				DatabaseID:            req.DatabaseID,
+				DatabaseID:            databaseID,
 				TablePrefixWithSchema: req.TablePrefixWithSchema,
 				Version:               req.Version,
 				KeyValues:             req.KeyValues,

test/v1/sdk.go

@@ -36,8 +36,8 @@ func newToolKit(t *testing.T) *ToolKit {
 	return &ToolKit{t: t}
 }
 
-func (toolKit *ToolKit) autoMigrate(req *client.AutoMigrateRequest) *ToolKit {
-	err := clientInstance.AutoMigrate(req)
+func (toolKit *ToolKit) autoMigrate(databaseID string, req *client.AutoMigrateRequest) *ToolKit {
+	err := clientInstance.AutoMigrate(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -45,8 +45,8 @@ func (toolKit *ToolKit) autoMigrate(req *client.AutoMigrateRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) autoMigrateBatch(req *client.AutoMigrateBatchRequest) *ToolKit {
-	err := clientInstance.AutoMigrateBatch(req)
+func (toolKit *ToolKit) autoMigrateBatch(databaseID string, req *client.AutoMigrateBatchRequest) *ToolKit {
+	err := clientInstance.AutoMigrateBatch(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -63,8 +63,8 @@ func (toolKit *ToolKit) transaction(databaseID string, txFunc client.Transaction
 	return toolKit
 }
 
-func (toolKit *ToolKit) insert(req *client.InsertRequest) *ToolKit {
-	statement, err := clientInstance.Insert(req)
+func (toolKit *ToolKit) insert(databaseID string, req *client.InsertRequest) *ToolKit {
+	statement, err := clientInstance.Insert(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -74,8 +74,8 @@ func (toolKit *ToolKit) insert(req *client.InsertRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) insertBatch(req *client.InsertBatchRequest) *ToolKit {
-	statement, err := clientInstance.InsertBatch(req)
+func (toolKit *ToolKit) insertBatch(databaseID string, req *client.InsertBatchRequest) *ToolKit {
+	statement, err := clientInstance.InsertBatch(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -85,8 +85,8 @@ func (toolKit *ToolKit) insertBatch(req *client.InsertBatchRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) delete(req *client.DeleteRequest) *ToolKit {
-	statement, err := clientInstance.Delete(req)
+func (toolKit *ToolKit) delete(databaseID string, req *client.DeleteRequest) *ToolKit {
+	statement, err := clientInstance.Delete(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -96,8 +96,8 @@ func (toolKit *ToolKit) delete(req *client.DeleteRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) deleteBatch(req *client.DeleteBatchRequest) *ToolKit {
-	statement, err := clientInstance.DeleteBatch(req)
+func (toolKit *ToolKit) deleteBatch(databaseID string, req *client.DeleteBatchRequest) *ToolKit {
+	statement, err := clientInstance.DeleteBatch(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -107,8 +107,8 @@ func (toolKit *ToolKit) deleteBatch(req *client.DeleteBatchRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) update(req *client.UpdateRequest) *ToolKit {
-	statement, err := clientInstance.Update(req)
+func (toolKit *ToolKit) update(databaseID string, req *client.UpdateRequest) *ToolKit {
+	statement, err := clientInstance.Update(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -118,8 +118,8 @@ func (toolKit *ToolKit) update(req *client.UpdateRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) reply(req *client.ReplayRequest) *ToolKit {
-	statement, err := clientInstance.Replay(req)
+func (toolKit *ToolKit) reply(databaseID string, req *client.ReplayRequest) *ToolKit {
+	statement, err := clientInstance.Replay(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -129,8 +129,8 @@ func (toolKit *ToolKit) reply(req *client.ReplayRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) queryByWhereAndOrderBy(req *client.QueryByWhereAndOrderByRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
-	statement, infosMap, totalCount, err := clientInstance.QueryByWhereAndOrderBy(req)
+func (toolKit *ToolKit) queryByWhereAndOrderBy(databaseID string, req *client.QueryByWhereAndOrderByRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
+	statement, infosMap, totalCount, err := clientInstance.QueryByWhereAndOrderBy(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -149,8 +149,8 @@ func (toolKit *ToolKit) queryByWhereAndOrderBy(req *client.QueryByWhereAndOrderB
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonQuery(req *client.CommonQueryRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
-	statement, infosMap, totalCount, err := clientInstance.CommonQuery(req)
+func (toolKit *ToolKit) commonQuery(databaseID string, req *client.CommonQueryRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
+	statement, infosMap, totalCount, err := clientInstance.CommonQuery(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -169,8 +169,8 @@ func (toolKit *ToolKit) commonQuery(req *client.CommonQueryRequest, retInfosMap
 	return toolKit
 }
 
-func (toolKit *ToolKit) queryByKeys(req *client.QueryByKeysRequest, retInfoMap *map[string]any) *ToolKit {
-	statement, infoMap, err := clientInstance.QueryByKeys(req)
+func (toolKit *ToolKit) queryByKeys(databaseID string, req *client.QueryByKeysRequest, retInfoMap *map[string]any) *ToolKit {
+	statement, infoMap, err := clientInstance.QueryByKeys(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -185,8 +185,8 @@ func (toolKit *ToolKit) queryByKeys(req *client.QueryByKeysRequest, retInfoMap *
 	return toolKit
 }
 
-func (toolKit *ToolKit) countWhere(req *client.CountWhereRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CountWhere(req)
+func (toolKit *ToolKit) countWhere(databaseID string, req *client.CountWhereRequest, retCount *int64) *ToolKit {
+	statement, count, err := clientInstance.CountWhere(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -200,8 +200,8 @@ func (toolKit *ToolKit) countWhere(req *client.CountWhereRequest, retCount *int6
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonCount(req *client.CommonCountRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CommonCount(req)
+func (toolKit *ToolKit) commonCount(databaseID string, req *client.CommonCountRequest, retCount *int64) *ToolKit {
+	statement, count, err := clientInstance.CommonCount(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -215,8 +215,8 @@ func (toolKit *ToolKit) commonCount(req *client.CommonCountRequest, retCount *in
 	return toolKit
 }
 
-func (toolKit *ToolKit) eventQueryByKeys(req *client.EventQueryByKeysRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
-	statement, infos, totalCount, err := clientInstance.EventQueryByKeys(req)
+func (toolKit *ToolKit) eventQueryByKeys(databaseID string, req *client.EventQueryByKeysRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
+	statement, infos, totalCount, err := clientInstance.EventQueryByKeys(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -235,8 +235,8 @@ func (toolKit *ToolKit) eventQueryByKeys(req *client.EventQueryByKeysRequest, re
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonEventQuery(req *client.CommonEventQueryRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
-	statement, infos, totalCount, err := clientInstance.CommonEventQuery(req)
+func (toolKit *ToolKit) commonEventQuery(databaseID string, req *client.CommonEventQueryRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
+	statement, infos, totalCount, err := clientInstance.CommonEventQuery(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -255,8 +255,8 @@ func (toolKit *ToolKit) commonEventQuery(req *client.CommonEventQueryRequest, re
 	return toolKit
 }
 
-func (toolKit *ToolKit) countEventByKeys(req *client.CountEventByKeysRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CountEventByKeys(req)
+func (toolKit *ToolKit) countEventByKeys(databaseID string, req *client.CountEventByKeysRequest, retCount *int64) *ToolKit {
+	statement, count, err := clientInstance.CountEventByKeys(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -270,8 +270,8 @@ func (toolKit *ToolKit) countEventByKeys(req *client.CountEventByKeysRequest, re
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonCountEvent(req *client.CommonCountEventRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CommonCountEvent(req)
+func (toolKit *ToolKit) commonCountEvent(databaseID string, req *client.CommonCountEventRequest, retCount *int64) *ToolKit {
+	statement, count, err := clientInstance.CommonCountEvent(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -285,8 +285,8 @@ func (toolKit *ToolKit) commonCountEvent(req *client.CommonCountEventRequest, re
 	return toolKit
 }
 
-func (toolKit *ToolKit) eventHistoryQueryByKeys(req *client.EventQueryByKeysRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
-	statement, infos, totalCount, err := clientInstance.EventHistoryQueryByKeys(req)
+func (toolKit *ToolKit) eventHistoryQueryByKeys(databaseID string, req *client.EventQueryByKeysRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
+	statement, infos, totalCount, err := clientInstance.EventHistoryQueryByKeys(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -305,8 +305,8 @@ func (toolKit *ToolKit) eventHistoryQueryByKeys(req *client.EventQueryByKeysRequ
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonEventHistoryQuery(req *client.CommonEventQueryRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
-	statement, infos, totalCount, err := clientInstance.CommonEventHistoryQuery(req)
+func (toolKit *ToolKit) commonEventHistoryQuery(databaseID string, req *client.CommonEventQueryRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
+	statement, infos, totalCount, err := clientInstance.CommonEventHistoryQuery(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -325,8 +325,8 @@ func (toolKit *ToolKit) commonEventHistoryQuery(req *client.CommonEventQueryRequ
 	return toolKit
 }
 
-func (toolKit *ToolKit) countEventHistoryByKeys(req *client.CountEventByKeysRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CountEventHistoryByKeys(req)
+func (toolKit *ToolKit) countEventHistoryByKeys(databaseID string, req *client.CountEventByKeysRequest, retCount *int64) *ToolKit {
+	statement, count, err := clientInstance.CountEventHistoryByKeys(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -340,8 +340,8 @@ func (toolKit *ToolKit) countEventHistoryByKeys(req *client.CountEventByKeysRequ
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonCountEventHistory(req *client.CommonCountEventRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CommonCountEventHistory(req)
+func (toolKit *ToolKit) commonCountEventHistory(databaseID string, req *client.CommonCountEventRequest, retCount *int64) *ToolKit {
+	statement, count, err := clientInstance.CommonCountEventHistory(databaseID, req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}

test/v1/v1_test.go

@@ -22,16 +22,14 @@ func TestAutoMigrate(t *testing.T) {
 	defer destroyClient(t)
 
 	newToolKit(t).
-		autoMigrate(&client.AutoMigrateRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: "test." + simpleUUID()[0:8],
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		autoMigrateBatch(&client.AutoMigrateBatchRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		autoMigrateBatch("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateBatchRequest{
 			Items: []client.AutoMigrateItem{
 				{
 					TablePrefixWithSchema: "test." + simpleUUID()[0:8],
@@ -65,8 +63,7 @@ func TestTransaction(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate(&client.AutoMigrateRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
@@ -74,8 +71,7 @@ func TestTransaction(t *testing.T) {
 			},
 		}).
 		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
-			statement, err := tx.InsertTx(&client.InsertRequest{
-				DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+			statement, err := tx.InsertTx("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				KeyColumns:            []string{"id"},
@@ -100,8 +96,7 @@ func TestTransaction(t *testing.T) {
 
 			return nil
 		}).
-		queryByKeys(&client.QueryByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -111,8 +106,7 @@ func TestTransaction(t *testing.T) {
 		assertEqual(now.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(tableNum, resultMap["table_num"], "表数量不一致").
 		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
-			statement, err := tx.UpdateTx(&client.UpdateRequest{
-				DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+			statement, err := tx.UpdateTx("2b78141779ee432295ca371b91c5cac7", &client.UpdateRequest{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				KeyValues:             map[string]string{"id": id},
@@ -137,8 +131,7 @@ func TestTransaction(t *testing.T) {
 
 			return nil
 		}).
-		queryByKeys(&client.QueryByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -148,8 +141,7 @@ func TestTransaction(t *testing.T) {
 		assertEqual(newNow.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(newTableNum, resultMap["table_num"], "表数量不一致").
 		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
-			statement, err := tx.UpdateTx(&client.UpdateRequest{
-				DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+			statement, err := tx.UpdateTx("2b78141779ee432295ca371b91c5cac7", &client.UpdateRequest{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				KeyValues:             map[string]string{"id": id},
@@ -167,8 +159,7 @@ func TestTransaction(t *testing.T) {
 
 			fmt.Println(statement)
 
-			statement, err = tx.DeleteTx(&client.DeleteRequest{
-				DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+			statement, err = tx.DeleteTx("2b78141779ee432295ca371b91c5cac7", &client.DeleteRequest{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				KeyValues:             map[string]string{"id": id},
@@ -187,8 +178,7 @@ func TestTransaction(t *testing.T) {
 
 			return nil
 		}).
-		countWhere(&client.CountWhereRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		countWhere("2b78141779ee432295ca371b91c5cac7", &client.CountWhereRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -222,8 +212,7 @@ func TestTransactionBatch(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate(&client.AutoMigrateRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
@@ -231,8 +220,7 @@ func TestTransactionBatch(t *testing.T) {
 			},
 		}).
 		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
-			statement, err := tx.InsertBatchTx(&client.InsertBatchRequest{
-				DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+			statement, err := tx.InsertBatchTx("2b78141779ee432295ca371b91c5cac7", &client.InsertBatchRequest{
 				Items: []*client.InsertTableItem{
 					{
 						TablePrefixWithSchema: tablePrefix,
@@ -274,8 +262,7 @@ func TestTransactionBatch(t *testing.T) {
 
 			return nil
 		}).
-		queryByKeys(&client.QueryByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id1},
@@ -284,8 +271,7 @@ func TestTransactionBatch(t *testing.T) {
 		assertEqual(name1, resultMap["name"], "名称不一致").
 		assertEqual(now1.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(tableNum1, resultMap["table_num"], "表数量不一致").
-		queryByKeys(&client.QueryByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id2},
@@ -295,8 +281,7 @@ func TestTransactionBatch(t *testing.T) {
 		assertEqual(now2.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(tableNum2, resultMap["table_num"], "表数量不一致").
 		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
-			statement, err := tx.DeleteBatchTx(&client.DeleteBatchRequest{
-				DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+			statement, err := tx.DeleteBatchTx("2b78141779ee432295ca371b91c5cac7", &client.DeleteBatchRequest{
 				Items: []*client.DeleteTableItem{
 					{
 						TablePrefixWithSchema: tablePrefix,
@@ -322,8 +307,7 @@ func TestTransactionBatch(t *testing.T) {
 
 			return nil
 		}).
-		countWhere(&client.CountWhereRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		countWhere("2b78141779ee432295ca371b91c5cac7", &client.CountWhereRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -335,8 +319,7 @@ func TestTransactionBatch(t *testing.T) {
 			},
 		}, &count).
 		assertEqual(int64(0), count, "数量不一致").
-		countWhere(&client.CountWhereRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		countWhere("2b78141779ee432295ca371b91c5cac7", &client.CountWhereRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -364,16 +347,14 @@ func TestInsert(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate(&client.AutoMigrateRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert(&client.InsertRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		insert("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyColumns:            []string{"id"},
@@ -385,8 +366,7 @@ func TestInsert(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		queryByKeys(&client.QueryByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -417,16 +397,14 @@ func TestInsertBatch(t *testing.T) {
 	var totalCount int64
 
 	newToolKit(t).
-		autoMigrate(&client.AutoMigrateRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insertBatch(&client.InsertBatchRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		insertBatch("2b78141779ee432295ca371b91c5cac7", &client.InsertBatchRequest{
 			Items: []*client.InsertTableItem{
 				{
 					TablePrefixWithSchema: tablePrefix,
@@ -455,8 +433,7 @@ func TestInsertBatch(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		queryByWhereAndOrderBy(&client.QueryByWhereAndOrderByRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		queryByWhereAndOrderBy("2b78141779ee432295ca371b91c5cac7", &client.QueryByWhereAndOrderByRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -472,8 +449,7 @@ func TestInsertBatch(t *testing.T) {
 		assertEqual(name1, resultsMap[0]["name"], "名称不一致").
 		assertEqual(now1.UnixMilli(), resultsMap[0]["time"].(time.Time).Local().UnixMilli(), "时间不一致").
 		assertEqual(tableNum1, resultsMap[0]["table_num"], "表数量不一致").
-		commonQuery(&client.CommonQueryRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -508,16 +484,14 @@ func TestUpdate(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate(&client.AutoMigrateRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert(&client.InsertRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		insert("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyColumns:            []string{"id"},
@@ -529,8 +503,7 @@ func TestUpdate(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		update(&client.UpdateRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		update("2b78141779ee432295ca371b91c5cac7", &client.UpdateRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -542,8 +515,7 @@ func TestUpdate(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		queryByKeys(&client.QueryByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -568,16 +540,14 @@ func TestDelete(t *testing.T) {
 	var count int64
 
 	newToolKit(t).
-		autoMigrate(&client.AutoMigrateRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert(&client.InsertRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		insert("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyColumns:            []string{"id"},
@@ -589,15 +559,13 @@ func TestDelete(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		delete(&client.DeleteRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		delete("2b78141779ee432295ca371b91c5cac7", &client.DeleteRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
 			UserID:                "test",
 		}).
-		countWhere(&client.CountWhereRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		countWhere("2b78141779ee432295ca371b91c5cac7", &client.CountWhereRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -630,16 +598,14 @@ func TestDeleteBatch(t *testing.T) {
 	var count int64
 
 	newToolKit(t).
-		autoMigrate(&client.AutoMigrateRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insertBatch(&client.InsertBatchRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		insertBatch("2b78141779ee432295ca371b91c5cac7", &client.InsertBatchRequest{
 			Items: []*client.InsertTableItem{
 				{
 					TablePrefixWithSchema: tablePrefix,
@@ -668,8 +634,7 @@ func TestDeleteBatch(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		deleteBatch(&client.DeleteBatchRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		deleteBatch("2b78141779ee432295ca371b91c5cac7", &client.DeleteBatchRequest{
 			Items: []*client.DeleteTableItem{
 				{
 					TablePrefixWithSchema: tablePrefix,
@@ -682,8 +647,7 @@ func TestDeleteBatch(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		commonCount(&client.CommonCountRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonCount("2b78141779ee432295ca371b91c5cac7", &client.CommonCountRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 		}, &count).
@@ -704,16 +668,14 @@ func TestReply(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate(&client.AutoMigrateRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert(&client.InsertRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		insert("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyColumns:            []string{"id"},
@@ -725,15 +687,13 @@ func TestReply(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		reply(&client.ReplayRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		reply("2b78141779ee432295ca371b91c5cac7", &client.ReplayRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
 			UserID:                "test",
 		}).
-		queryByKeys(&client.QueryByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -762,16 +722,15 @@ func TestEventQuery(t *testing.T) {
 	eventInfos := make([]client.EventInfo, 0)
 
 	newToolKit(t).
-		autoMigrate(&client.AutoMigrateRequest{
-			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
+		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
+
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert(&client.InsertRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		insert("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyColumns:            []string{"id"},
@@ -783,8 +742,7 @@ func TestEventQuery(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		update(&client.UpdateRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		update("2b78141779ee432295ca371b91c5cac7", &client.UpdateRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -796,14 +754,12 @@ func TestEventQuery(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		countEventByKeys(&client.CountEventByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		countEventByKeys("2b78141779ee432295ca371b91c5cac7", &client.CountEventByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 		}, &totalCount).
 		assertEqual(2, int(totalCount), "总数不一致").
-		commonCountEvent(&client.CommonCountEventRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonCountEvent("2b78141779ee432295ca371b91c5cac7", &client.CommonCountEventRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -813,8 +769,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		commonCountEvent(&client.CommonCountEventRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonCountEvent("2b78141779ee432295ca371b91c5cac7", &client.CommonCountEventRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -824,8 +779,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		eventQueryByKeys(&client.EventQueryByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		eventQueryByKeys("2b78141779ee432295ca371b91c5cac7", &client.EventQueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			PageNo:                0,
@@ -845,8 +799,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[1].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[1].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[1].Value, "值为空不一致").
-		eventQueryByKeys(&client.EventQueryByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		eventQueryByKeys("2b78141779ee432295ca371b91c5cac7", &client.EventQueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			PageNo:                1,
@@ -860,8 +813,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventQuery(&client.CommonEventQueryRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonEventQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonEventQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -880,8 +832,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventQuery(&client.CommonEventQueryRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonEventQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonEventQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -900,21 +851,18 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		delete(&client.DeleteRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		delete("2b78141779ee432295ca371b91c5cac7", &client.DeleteRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
 			UserID:                "test",
 		}).
-		countEventHistoryByKeys(&client.CountEventByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		countEventHistoryByKeys("2b78141779ee432295ca371b91c5cac7", &client.CountEventByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 		}, &totalCount).
 		assertEqual(3, int(totalCount), "总数不一致").
-		commonCountEventHistory(&client.CommonCountEventRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonCountEventHistory("2b78141779ee432295ca371b91c5cac7", &client.CommonCountEventRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -924,8 +872,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		commonCountEventHistory(&client.CommonCountEventRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonCountEventHistory("2b78141779ee432295ca371b91c5cac7", &client.CommonCountEventRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -935,8 +882,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		commonCountEventHistory(&client.CommonCountEventRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonCountEventHistory("2b78141779ee432295ca371b91c5cac7", &client.CommonCountEventRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -946,8 +892,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		eventHistoryQueryByKeys(&client.EventQueryByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		eventHistoryQueryByKeys("2b78141779ee432295ca371b91c5cac7", &client.EventQueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			PageNo:                0,
@@ -973,8 +918,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[2].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[2].CreateTime, "创建事件为空").
 		assertEqual("", eventInfos[2].Value, "值为空不一致").
-		eventHistoryQueryByKeys(&client.EventQueryByKeysRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		eventHistoryQueryByKeys("2b78141779ee432295ca371b91c5cac7", &client.EventQueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			PageNo:                1,
@@ -988,8 +932,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventHistoryQuery(&client.CommonEventQueryRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonEventHistoryQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonEventQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -1008,8 +951,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventHistoryQuery(&client.CommonEventQueryRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonEventHistoryQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonEventQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -1028,8 +970,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventHistoryQuery(&client.CommonEventQueryRequest{
-			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
+		commonEventHistoryQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonEventQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",