separate event columns from insert columns in tests

Author: gangachris

driver/sql/postgres/eventstore.go

@@ -31,7 +31,7 @@ type EventStore struct {
 	persistenceStrategy driverSQL.PersistenceStrategy
 	db                  *sql.DB
 	messageFactory      driverSQL.MessageFactory
-	columns             string
+	insertColumns       string
 	columnCount         int
 	eventColumns        string
 	logger              goengine.Logger
@@ -72,7 +72,7 @@ func NewEventStore(
 		persistenceStrategy: persistenceStrategy,
 		db:                  db,
 		messageFactory:      messageFactory,
-		columns:             strings.Join(insertColumns, ", "),
+		insertColumns:       strings.Join(insertColumns, ", "),
 		columnCount:         len(insertColumns),
 		eventColumns:        strings.Join(selectColumns, ", "),
 		logger:              logger,
@@ -225,11 +225,11 @@ func (e *EventStore) AppendToWithExecer(ctx context.Context, conn driverSQL.Exec
 		return err
 	}
 
-	insertQuery := make([]byte, 0, 35+len(e.columns)+(e.columnCount*2)+(eventCount*3))
+	insertQuery := make([]byte, 0, 35+len(e.insertColumns)+(e.columnCount*2)+(eventCount*3))
 	insertQuery = append(insertQuery, "INSERT INTO "...)
 	insertQuery = append(insertQuery, tableName...)
 	insertQuery = append(insertQuery, " ("...)
-	insertQuery = append(insertQuery, e.columns...)
+	insertQuery = append(insertQuery, e.insertColumns...)
 	insertQuery = append(insertQuery, ") VALUES "...)
 	for i := 0; i < eventCount; i++ {
 		if i != 0 {

driver/sql/postgres/eventstore_test.go

@@ -330,7 +330,8 @@ func TestEventStore_Load(t *testing.T) {
 	})
 
 	t.Run("persistent strategy failures", func(t *testing.T) {
-		columns := []string{"no", "payload"}
+		insertColumns := []string{"no", "payload", "aggregate_id"}
+		eventColumns := []string{"no", "payload"}
 
 		testCases := []struct {
 			title         string
@@ -341,8 +342,8 @@ func TestEventStore_Load(t *testing.T) {
 				"Empty table name returned",
 				func(ctrl *gomock.Controller) *mockSQL.PersistenceStrategy {
 					strategy := mockSQL.NewPersistenceStrategy(ctrl)
-					strategy.EXPECT().InsertColumnNames().Return(columns).AnyTimes()
-					strategy.EXPECT().EventColumnNames().Return(columns).AnyTimes()
+					strategy.EXPECT().InsertColumnNames().Return(insertColumns).AnyTimes()
+					strategy.EXPECT().EventColumnNames().Return(eventColumns).AnyTimes()
 					strategy.EXPECT().GenerateTableName(goengine.StreamName("event_stream")).
 						Return("", nil).AnyTimes()
 					return strategy
@@ -353,8 +354,8 @@ func TestEventStore_Load(t *testing.T) {
 				"Empty table name returned",
 				func(ctrl *gomock.Controller) *mockSQL.PersistenceStrategy {
 					strategy := mockSQL.NewPersistenceStrategy(ctrl)
-					strategy.EXPECT().InsertColumnNames().Return(columns).AnyTimes()
-					strategy.EXPECT().EventColumnNames().Return(columns).AnyTimes()
+					strategy.EXPECT().InsertColumnNames().Return(insertColumns).AnyTimes()
+					strategy.EXPECT().EventColumnNames().Return(eventColumns).AnyTimes()
 					strategy.EXPECT().GenerateTableName(goengine.StreamName("event_stream")).
 						Return("", errors.New("failed gen")).AnyTimes()
 					return strategy