fix user-defined types

cli/version.go

@@ -1,3 +1,3 @@
 package cli
 
-const Version = "0.0.3"
+const Version = "0.0.4"

regtest/regtest.go

@@ -20,7 +20,8 @@ func (r *RegressionTest) Run() ([]order.Change, error) {
 	if err != nil {
 		return nil, err
 	}
-	if _, err := r.Conn.Exec(string(f1)); err != nil {
+	setup := bytes.Replace(f1, []byte("_schema_"), []byte(r.Conn.SchemaName), 1)
+	if _, err := r.Conn.Exec(string(setup)); err != nil {
 		return nil, err
 	}
 	f2, err := ioutil.ReadFile(r.SourceFile)

regtest/t003/citext_test.go

@@ -0,0 +1,28 @@
+package t001
+
+import (
+	"github.com/aj0strow/pgschema/regtest"
+	"github.com/aj0strow/pgschema/temp"
+	"testing"
+)
+
+func TestCitext(t *testing.T) {
+	conn, err := temp.Connect("pgschema")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer conn.Close()
+
+	rt := regtest.RegressionTest{
+		Conn:       conn,
+		SetupFile:  "./setup.sql",
+		SourceFile: "./schema.hcl",
+	}
+	have, err := rt.Run()
+	if err != nil {
+		t.Fatal(err)
+	}
+	for _, c := range have {
+		t.Errorf(c.String())
+	}
+}

regtest/t003/schema.hcl

@@ -0,0 +1,9 @@
+
+schema "_schema_" {
+  table "users" {
+    column "user_name" {
+      type = "citext"
+      not_null = true
+    }
+  }
+}

regtest/t003/setup.sql

@@ -0,0 +1,4 @@
+
+CREATE TABLE users (
+  user_name public.citext not null
+);

source/psql/column.go

@@ -30,7 +30,8 @@ func LoadColumns(conn Conn, schemaName, tableName string) ([]db.Column, error) {
 			column_default,
 			numeric_precision,
 			numeric_scale,
-			numeric_precision_radix
+			numeric_precision_radix,
+			udt_name
 		FROM information_schema.columns
 		WHERE table_schema = '%s'
 		AND table_name = '%s'
@@ -49,6 +50,7 @@ func LoadColumns(conn Conn, schemaName, tableName string) ([]db.Column, error) {
 			numericPrecision pgx.NullInt32
 			numericScale     pgx.NullInt32
 			numericRadix     pgx.NullInt32
+			udtName          string
 		)
 		err := rows.Scan(
 			&column.ColumnName,
@@ -58,10 +60,14 @@ func LoadColumns(conn Conn, schemaName, tableName string) ([]db.Column, error) {
 			&numericPrecision,
 			&numericScale,
 			&numericRadix,
+			&udtName,
 		)
 		if err != nil {
 			return nil, err
 		}
+		if column.DataType == "USER-DEFINED" {
+			column.DataType = udtName
+		}
 		column.NotNull = isNullable == "NO"
 		column.Default = colDefault.String
 		if numericRadix.Valid {