#22 when migration table name defined with table schema migrator can'…

…t find that table after creation (#23)

* #22 when migration table name defined with table schema migrator can't find that table after creation

* #22 when migration table name defined with table schema migrator can't find that table after creation

docker-compose.yml

@@ -8,6 +8,8 @@ services:
 
   postgres:
     image: postgres:12-alpine
+    volumes:
+      - "./docker/volume/postgres/dump:/docker-entrypoint-initdb.d/"
     env_file:
       - .env
 

docker/volume/postgres/dump/init.sql

@@ -0,0 +1 @@
+CREATE SCHEMA docker;

migrator/db/postgresMigration/migration.go

@@ -18,21 +18,23 @@ import (
 	"time"
 )
 
-const defaultSchema = "public"
+const DefaultSchema = "public"
 
 type (
 	Migration struct {
-		connection *sql.DB
-		tableName  string
-		directory  string
+		connection  *sql.DB
+		tableName   string
+		tableSchema string
+		directory   string
 	}
 )
 
-func New(connection *sql.DB, tableName, directory string) *Migration {
+func New(connection *sql.DB, tableName, tableSchema, directory string) *Migration {
 	return &Migration{
-		connection: connection,
-		tableName:  tableName,
-		directory:  directory,
+		connection:  connection,
+		tableName:   tableName,
+		tableSchema: tableSchema,
+		directory:   directory,
 	}
 }
 
@@ -85,7 +87,7 @@ func (s *Migration) GetMigrationHistory(limit int) (db.MigrationEntityList, erro
 			FROM %s
 			ORDER BY apply_time DESC, version DESC
 			LIMIT $1`,
-			s.tableName,
+			s.getTableNameWithSchema(),
 		)
 		result db.MigrationEntityList
 	)
@@ -126,22 +128,22 @@ func (s *Migration) AddMigrationHistory(version string) error {
 	q := fmt.Sprintf(`
 		INSERT INTO %s (version, apply_time) 
 		VALUES ($1, $2)`,
-		s.tableName,
+		s.getTableNameWithSchema(),
 	)
 	_, err := s.connection.Exec(q, version, now)
 
 	return s.internalConvertError(err, q)
 }
 
 func (s *Migration) RemoveMigrationHistory(version string) error {
-	q := fmt.Sprintf(`DELETE FROM %s WHERE (version) = ($1)`, s.tableName)
+	q := fmt.Sprintf(`DELETE FROM %s WHERE (version) = ($1)`, s.getTableNameWithSchema())
 	_, err := s.connection.Exec(q, version)
 
 	return err
 }
 
 func (s *Migration) createMigrationHistoryTable() error {
-	log.Printf(console.Yellow("Creating migration history table %s..."), s.tableName)
+	log.Printf(console.Yellow("Creating migration history table %s..."), s.getTableNameWithSchema())
 
 	q := fmt.Sprintf(
 		`
@@ -150,14 +152,14 @@ func (s *Migration) createMigrationHistoryTable() error {
 				  apply_time integer
 				)
 			`,
-		s.tableName,
+		s.getTableNameWithSchema(),
 	)
 
 	if _, err := s.connection.Exec(q); err != nil {
 		return s.internalConvertError(err, q)
 	}
 	if err := s.AddMigrationHistory(db.BaseMigration); err != nil {
-		q2 := fmt.Sprintf(`DROP TABLE %s`, s.tableName)
+		q2 := fmt.Sprintf(`DROP TABLE %s`, s.getTableNameWithSchema())
 		_, _ = s.connection.Exec(q2)
 
 		return err
@@ -181,7 +183,7 @@ func (s *Migration) getTableScheme() (exists bool, err error) {
 		rows *sql.Rows
 	)
 
-	rows, err = s.connection.Query(q, s.tableName, defaultSchema)
+	rows, err = s.connection.Query(q, s.tableName, s.tableSchema)
 	if err != nil {
 		return false, s.internalConvertError(err, q)
 	}
@@ -203,3 +205,7 @@ func (s *Migration) getTableScheme() (exists bool, err error) {
 
 	return false, nil
 }
+
+func (s *Migration) getTableNameWithSchema() string {
+	return s.tableSchema + "." + s.tableName
+}

migrator/migrator.go

@@ -66,9 +66,19 @@ func (s *Service) initPostgres() error {
 		return err
 	}
 
+	var tableName, tableSchema string
+	if strings.Contains(s.options.TableName, ".") {
+		parts := strings.Split(s.options.TableName, ".")
+		tableSchema = parts[0]
+		tableName = parts[1]
+	} else {
+		tableSchema = postgresMigration.DefaultSchema
+		tableName = s.options.TableName
+	}
+
 	s.db = connection
 	s.migration = db.NewMigration(
-		postgresMigration.New(connection, s.options.TableName, s.options.Directory),
+		postgresMigration.New(connection, tableName, tableSchema, s.options.Directory),
 		connection,
 		db.MigrationOptions{
 			MaxSqlOutputLength: s.options.MaxSqlOutputLength,

migrator/migrator_postgres_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestMigrateService_Postgres_UpDown_Successfully(t *testing.T) {
-	m, err := createPostgresMigrator()
+	m, err := createPostgresMigrator("migration")
 	assert.NoError(t, err)
 
 	err = m.Down("all")
@@ -24,13 +24,64 @@ func TestMigrateService_Postgres_UpDown_Successfully(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, 0, c)
 
-	err = m.db.QueryRow("select count(*) from migration").Scan(&c)
+	err = m.db.QueryRow("select count(*) from public.migration").Scan(&c)
 	assert.NoError(t, err)
 	assert.Equal(t, 3, c)
+
+	err = m.Down("all")
+	assert.NoError(t, err)
 }
 
 func TestMigrateService_Postgres_Redo_Successfully(t *testing.T) {
-	m, err := createPostgresMigrator()
+	m, err := createPostgresMigrator("migration")
+	assert.NoError(t, err)
+
+	err = m.Down("all")
+	assert.NoError(t, err)
+
+	err = m.Up("2")
+	assert.NoError(t, err)
+
+	err = m.Redo("1")
+	assert.NoError(t, err)
+
+	var c int
+	err = m.db.QueryRow("select count(*) from public.migration").Scan(&c)
+	assert.NoError(t, err)
+	assert.Equal(t, 3, c)
+
+	err = m.Down("all")
+	assert.NoError(t, err)
+}
+
+func TestMigrateService_Postgres_UpDown_WithSchema_Successfully(t *testing.T) {
+	m, err := createPostgresMigrator("docker.migration")
+	assert.NoError(t, err)
+
+	err = m.Down("all")
+	assert.NoError(t, err)
+
+	err = m.Up("2")
+	assert.NoError(t, err)
+
+	err = m.Up("1")
+	assert.Error(t, err)
+
+	var c int
+	err = m.db.QueryRow("select count(*) from test").Scan(&c)
+	assert.NoError(t, err)
+	assert.Equal(t, 0, c)
+
+	err = m.db.QueryRow("select count(*) from docker.migration").Scan(&c)
+	assert.NoError(t, err)
+	assert.Equal(t, 3, c)
+
+	err = m.Down("all")
+	assert.NoError(t, err)
+}
+
+func TestMigrateService_Postgres_Redo_WithSchema_Successfully(t *testing.T) {
+	m, err := createPostgresMigrator("docker.migration")
 	assert.NoError(t, err)
 
 	err = m.Down("all")
@@ -43,16 +94,19 @@ func TestMigrateService_Postgres_Redo_Successfully(t *testing.T) {
 	assert.NoError(t, err)
 
 	var c int
-	err = m.db.QueryRow("select count(*) from migration").Scan(&c)
+	err = m.db.QueryRow("select count(*) from docker.migration").Scan(&c)
 	assert.NoError(t, err)
 	assert.Equal(t, 3, c)
+
+	err = m.Down("all")
+	assert.NoError(t, err)
 }
 
-func createPostgresMigrator() (*Service, error) {
+func createPostgresMigrator(migrationTableName string) (*Service, error) {
 	return New(Options{
 		DSN:         os.Getenv("POSTGRES_DSN"),
 		Directory:   os.Getenv("POSTGRES_MIGRATIONS_PATH"),
-		TableName:   "migration",
+		TableName:   migrationTableName,
 		Compact:     false,
 		Interactive: false,
 	})