fixup! chore: some review comments work

jobsdb/integration_test.go

@@ -1027,7 +1027,7 @@ func requireSequential(t *testing.T, jobs []*JobT) {
 func TestJobsDB_SanitizeJSON(t *testing.T) {
 	_ = startPostgres(t)
 	conf := config.New()
-	conf.Set("JobsDB.payloadColumnType", 0)
+	conf.Set("JobsDB.payloadColumnType", "jsonb")
 	jobDB := Handle{config: conf}
 	ch := func(n int) string {
 		return strings.Repeat("�", n)
@@ -1114,7 +1114,7 @@ func TestJobsDB_SanitizeJSON(t *testing.T) {
 	}
 	jobDB.TearDown()
 
-	conf.Set("JobsDB.payloadColumnType", 2)
+	conf.Set("JobsDB.payloadColumnType", "text")
 	textDB := &Handle{config: conf}
 	require.NoError(t, textDB.Setup(ReadWrite, true, strings.ToLower(rand.String(5))))
 
@@ -1197,7 +1197,7 @@ func TestJobsDB_SanitizeJSON(t *testing.T) {
 	}
 	textDB.TearDown()
 
-	conf.Set("JobsDB.payloadColumnType", 1)
+	conf.Set("JobsDB.payloadColumnType", "bytea")
 	byteaDB := &Handle{config: conf}
 	require.NoError(t, byteaDB.Setup(ReadWrite, true, strings.ToLower(rand.String(5))))
 

jobsdb/jobsdb.go

@@ -83,9 +83,9 @@ type payloadColumnType string
 
 const (
 	JSONB payloadColumnType = "jsonb"
-	BYTEA                   = "bytea"
-	TEXT                    = "text"
-	// JSON	// Explore afterwards?
+	BYTEA payloadColumnType = "bytea"
+	TEXT  payloadColumnType = "text"
+	// JSON	??
 )
 
 // QueryConditions holds jobsdb query conditions
@@ -720,13 +720,13 @@ func WithStats(s stats.Stats) OptsFunc {
 
 func WithBinaryPayload() OptsFunc {
 	return func(jd *Handle) {
-		jd.conf.payloadColumnType = "bytea"
+		jd.conf.payloadColumnType = BYTEA
 	}
 }
 
 func WithTextPayload() OptsFunc {
 	return func(jd *Handle) {
-		jd.conf.payloadColumnType = "text"
+		jd.conf.payloadColumnType = TEXT
 	}
 }
 
@@ -798,8 +798,8 @@ func (jd *Handle) init() {
 		jd.config = config.Default
 	}
 
-	if jd.conf.payloadColumnType == "" {
-		jd.conf.payloadColumnType = payloadColumnType(jd.config.GetStringVar(TEXT, "JobsDB.payloadColumnType"))
+	if string(jd.conf.payloadColumnType) == "" {
+		jd.conf.payloadColumnType = payloadColumnType(jd.config.GetStringVar(string(TEXT), "JobsDB.payloadColumnType"))
 	}
 
 	if jd.stats == nil {
@@ -1461,14 +1461,16 @@ func (jd *Handle) createDSInTx(tx *Tx, newDS dataSetT) error {
 }
 
 func (jd *Handle) createDSTablesInTx(ctx context.Context, tx *Tx, newDS dataSetT) error {
-	var payloadColumnType string
+	var columnType payloadColumnType
 	switch jd.conf.payloadColumnType {
 	case JSONB:
-		payloadColumnType = "JSONB"
+		columnType = JSONB
 	case BYTEA:
-		payloadColumnType = "BYTEA"
-	case TEXT:
-		payloadColumnType = "TEXT"
+		columnType = BYTEA
+	// case TEXT:
+	// 	columnType = TEXT
+	default:
+		columnType = TEXT
 	}
 	if _, err := tx.ExecContext(ctx, fmt.Sprintf(`CREATE TABLE %q (
 		job_id BIGSERIAL PRIMARY KEY,
@@ -1477,7 +1479,7 @@ func (jd *Handle) createDSTablesInTx(ctx context.Context, tx *Tx, newDS dataSetT
 		user_id TEXT NOT NULL,
 		parameters JSONB NOT NULL,
 		custom_val VARCHAR(64) NOT NULL,
-		event_payload `+payloadColumnType+` NOT NULL,
+		event_payload `+string(columnType)+` NOT NULL,
 		event_count INTEGER NOT NULL DEFAULT 1,
 		created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
 		expire_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW());`, newDS.JobTable)); err != nil {

jobsdb/migration.go

@@ -508,7 +508,7 @@ func (jd *Handle) migrateJobsInTx(ctx context.Context, tx *Tx, srcDS, destDS dat
 		ctx,
 		`select table_name, data_type
 		from information_schema.columns
-		where table_name IN (?, ?) and column_name='event_payload';`,
+		where table_name IN ($1, $2) and column_name='event_payload';`,
 		srcDS.JobTable, destDS.JobTable,
 	)
 	if err != nil {

jobsdb/migration_test.go

@@ -537,33 +537,33 @@ func TestPayloadLiteral(t *testing.T) {
 	byteJD := Handle{
 		config: c,
 	}
-	byteJD.conf.payloadColumnType = "bytea"
+	byteJD.conf.payloadColumnType = BYTEA
 	require.NoError(t, byteJD.Setup(
 		ReadWrite,
 		true,
-		"bytea",
+		string(BYTEA),
 	))
 	defer byteJD.TearDown()
 
 	jsonbJD := Handle{
 		config: c,
 	}
-	jsonbJD.conf.payloadColumnType = "jsonb"
+	jsonbJD.conf.payloadColumnType = JSONB
 	require.NoError(t, jsonbJD.Setup(
 		ReadWrite,
 		true,
-		"jsonb",
+		string(JSONB),
 	))
 	defer jsonbJD.TearDown()
 
 	textJD := Handle{
 		config: c,
 	}
-	textJD.conf.payloadColumnType = "text"
+	textJD.conf.payloadColumnType = TEXT
 	require.NoError(t, textJD.Setup(
 		ReadWrite,
 		true,
-		"text",
+		string(TEXT),
 	))
 	defer textJD.TearDown()
 
@@ -573,7 +573,7 @@ func TestPayloadLiteral(t *testing.T) {
 	require.NoError(t, textJD.Store(ctx, jobs))
 	require.NoError(t, jsonbJD.Store(ctx, jobs))
 
-	prefixes := []string{"text", "jsonb", "bytea"}
+	prefixes := []string{string(TEXT), string(JSONB), string(BYTEA)}
 	for i := range prefixes {
 		_, err := db.ExecContext(ctx, fmt.Sprintf(`ALTER TABLE %[1]s_job_status_1 DROP CONSTRAINT fk_%[1]s_job_status_1_job_id`, prefixes[i]))
 		require.NoError(t, err)
@@ -603,7 +603,7 @@ func TestPayloadLiteral(t *testing.T) {
 					Index:          "1",
 				},
 			)
-			require.NoError(t, err)
+			require.NoError(t, err, src, dest)
 		}
 	}
 	require.NoError(t, txn.Commit())