Add constraints option to create_table and unique constraint support

pkg/migrations/op_create_table.go

@@ -195,15 +195,9 @@ func constraintsToSQL(constraints []Constraint) (string, error) {
 			Columns:           c.Columns,
 			InitiallyDeferred: c.InitiallyDeferred,
 			Deferrable:        c.Deferrable,
-		}
-		if c.IndexParameters != nil {
-			writer.IncludeColumns = c.IndexParameters.IncludeColumns
-			if c.IndexParameters.StorageParameters != nil {
-				writer.StorageParameters = *c.IndexParameters.StorageParameters
-			}
-			if c.IndexParameters.Tablespace != nil {
-				writer.Tablespace = *c.IndexParameters.Tablespace
-			}
+			IncludeColumns:    c.IndexParameters.IncludeColumns,
+			StorageParameters: c.IndexParameters.StorageParameters,
+			Tablespace:        c.IndexParameters.Tablespace,
 		}
 
 		switch c.Type { //nolint:gocritic // more cases are coming soon
@@ -220,22 +214,22 @@ func constraintsToSQL(constraints []Constraint) (string, error) {
 type ConstraintSQLWriter struct {
 	Name              string
 	Columns           []string
-	InitiallyDeferred *bool
-	Deferrable        *bool
+	InitiallyDeferred bool
+	Deferrable        bool
 
 	// unique, exclude, primary key constraints support the following options
 	IncludeColumns    []string
 	StorageParameters string
 	Tablespace        string
 }
 
-func (w *ConstraintSQLWriter) WriteUnique(nullsNotDistinct *bool) string {
+func (w *ConstraintSQLWriter) WriteUnique(nullsNotDistinct bool) string {
 	var constraint string
 	if w.Name != "" {
 		constraint = fmt.Sprintf("CONSTRAINT %s ", pq.QuoteIdentifier(w.Name))
 	}
 	nullsDistinct := ""
-	if nullsNotDistinct != nil && *nullsNotDistinct {
+	if nullsNotDistinct {
 		nullsDistinct = "NULLS NOT DISTINCT"
 	}
 	constraint += fmt.Sprintf("UNIQUE %s (%s)", nullsDistinct, strings.Join(quoteColumnNames(w.Columns), ", "))
@@ -259,23 +253,19 @@ func (w *ConstraintSQLWriter) addIndexParameters() string {
 }
 
 func (w *ConstraintSQLWriter) addDeferrable() string {
-	if w.InitiallyDeferred != nil && *w.Deferrable {
+	if !w.InitiallyDeferred && !w.Deferrable {
 		return ""
 	}
 	deferrable := ""
-	if w.Deferrable != nil {
-		if *w.Deferrable {
-			deferrable += " DEFERRABLE"
-		} else {
-			deferrable += " NOT DEFERRABLE"
-		}
+	if w.Deferrable {
+		deferrable += " DEFERRABLE"
+	} else {
+		deferrable += " NOT DEFERRABLE"
 	}
-	if w.InitiallyDeferred != nil {
-		if *w.InitiallyDeferred {
-			deferrable = " INITIALLY DEFERRED"
-		} else {
-			deferrable = " INITIALLY IMMEDIATE"
-		}
+	if w.InitiallyDeferred {
+		deferrable += " INITIALLY DEFERRED"
+	} else {
+		deferrable += " INITIALLY IMMEDIATE"
 	}
 	return deferrable
 }

pkg/sql2pgroll/convert.go

@@ -20,6 +20,7 @@ func Convert(sql string) (migrations.Operations, error) {
 	}
 
 	if ops == nil {
+		fmt.Println("ops is nil")
 		return makeRawSQLOperation(sql), nil
 	}
 

pkg/sql2pgroll/create_table.go

@@ -15,6 +15,7 @@ import (
 func convertCreateStmt(stmt *pgq.CreateStmt) (migrations.Operations, error) {
 	// Check if the statement can be converted
 	if !canConvertCreateStatement(stmt) {
+		fmt.Println("cannot convert create statement")
 		return nil, nil
 	}
 
@@ -203,12 +204,12 @@ func convertColumnDef(tableName string, col *pgq.ColumnDef) (*migrations.Column,
 
 func convertConstraint(c *pgq.Constraint) (*migrations.Constraint, error) {
 	var constraintType migrations.ConstraintType
-	var nullsNotDistinct *bool
+	var nullsNotDistinct bool
 
 	switch c.Contype {
 	case pgq.ConstrType_CONSTR_UNIQUE:
 		constraintType = migrations.ConstraintTypeUnique
-		nullsNotDistinct = ptr(c.NullsNotDistinct)
+		nullsNotDistinct = c.NullsNotDistinct
 	default:
 		return nil, nil
 	}
@@ -240,20 +241,12 @@ func convertConstraint(c *pgq.Constraint) (*migrations.Constraint, error) {
 		}
 		options[i] = fmt.Sprintf("%s = '%s'", option.GetDefElem().Defname, val)
 	}
-	var storageParameters *string
-	if len(options) != 0 {
-		storageParameters = ptr(strings.Join(options, ", "))
-	}
 
-	var tablespace *string
-	if c.Indexspace != "" {
-		tablespace = ptr(c.Indexspace)
-	}
 	var indexParameters *migrations.ConstraintIndexParameters
-	if storageParameters != nil || tablespace != nil || len(including) != 0 {
+	if len(options) != 0 || c.Indexspace != "" || len(including) != 0 {
 		indexParameters = &migrations.ConstraintIndexParameters{
-			StorageParameters: storageParameters,
-			Tablespace:        tablespace,
+			StorageParameters: strings.Join(options, ", "),
+			Tablespace:        c.Indexspace,
 			IncludeColumns:    including,
 		}
 	}
@@ -263,8 +256,8 @@ func convertConstraint(c *pgq.Constraint) (*migrations.Constraint, error) {
 		Type:              constraintType,
 		Columns:           columns,
 		NullsNotDistinct:  nullsNotDistinct,
-		Deferrable:        ptr(c.Deferrable),
-		InitiallyDeferred: ptr(c.Initdeferred),
+		Deferrable:        c.Deferrable,
+		InitiallyDeferred: c.Initdeferred,
 		IndexParameters:   indexParameters,
 	}, nil
 }

pkg/sql2pgroll/create_table_test.go

@@ -3,6 +3,7 @@
 package sql2pgroll_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -181,6 +182,7 @@ func TestConvertCreateTableStatements(t *testing.T) {
 
 			require.Len(t, ops, 1)
 
+			fmt.Println(ops[0])
 			createTableOp, ok := ops[0].(*migrations.OpCreateTable)
 			require.True(t, ok)
 

pkg/sql2pgroll/expect/create_table.go

@@ -318,9 +318,9 @@ var CreateTableOp22 = &migrations.OpCreateTable{
 		{
 			Type:              migrations.ConstraintTypeUnique,
 			Columns:           []string{"b", "c"},
-			NullsNotDistinct:  ptr(false),
-			Deferrable:        ptr(false),
-			InitiallyDeferred: ptr(false),
+			NullsNotDistinct:  false,
+			Deferrable:        false,
+			InitiallyDeferred: false,
 		},
 	},
 }
@@ -343,13 +343,13 @@ var CreateTableOp23 = &migrations.OpCreateTable{
 		{
 			Type:              migrations.ConstraintTypeUnique,
 			Columns:           []string{"b"},
-			NullsNotDistinct:  ptr(false),
-			Deferrable:        ptr(false),
-			InitiallyDeferred: ptr(false),
+			NullsNotDistinct:  false,
+			Deferrable:        false,
+			InitiallyDeferred: false,
 			IndexParameters: &migrations.ConstraintIndexParameters{
 				IncludeColumns:    []string{"c"},
-				StorageParameters: ptr("fillfactor = '70'"),
-				Tablespace:        ptr("my_tablespace"),
+				StorageParameters: "fillfactor = '70'",
+				Tablespace:        "my_tablespace",
 			},
 		},
 	},

schema.json

@@ -120,25 +120,30 @@
         },
         "deferrable": {
           "description": "Deferable constraint",
-          "type": "boolean"
+          "type": "boolean",
+          "default": false
         },
         "initially_deferred": {
           "description": "Initially deferred constraint",
-          "type": "boolean"
+          "type": "boolean",
+          "default": false
         },
         "nulls_not_distinct": {
           "description": "Nulls not distinct constraint",
-          "type": "boolean"
+          "type": "boolean",
+          "default": false
         },
         "index_parameters": {
           "type": "object",
           "additionalProperties": false,
           "properties": {
             "tablespace": {
-              "type": "string"
+              "type": "string",
+              "default": ""
             },
             "storage_parameters": {
-              "type": "string"
+              "type": "string",
+              "default": ""
             },
             "include_columns": {
               "type": "array",