column compare and usage output improvements

Author: joncrlsn

column.go

@@ -68,7 +68,7 @@ func (c ColumnSchema) Drop() {
 func (c ColumnSchema) Change(obj interface{}) {
 	c2, ok := obj.(*ColumnSchema)
 	if !ok {
-		fmt.Println("Error!!!, change needs a ColumnSchema instance", c2)
+		fmt.Println("Error!!!, ColumnSchema.Change(obj) needs a ColumnSchema instance", c2)
 	}
 
 	// Detect column type change (mostly varchar length, or number size increase)  (integer to/from bigint is OK)
@@ -94,39 +94,17 @@ func (c ColumnSchema) Change(obj interface{}) {
 			fmt.Printf("ALTER TABLE %s ALTER COLUMN %s DROP DEFAULT;\n", c.row["table_name"], c.row["column_name"])
 		}
 	} else if c.row["column_default"] != c2.row["column_default"] {
-		fmt.Printf("ALTER TABLE %s ALTER COLUMN %s DEFAULT %s;\n", c.row["table_name"], c.row["column_name"], c.row["column_default"])
+		fmt.Printf("ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s;\n", c.row["table_name"], c.row["column_name"], c.row["column_default"])
 	}
 
+	// TODO Detect not-null and nullable change
 	if c.row["is_nullable"] != c2.row["is_nullable"] {
 		if c.row["is_nullable"] == "YES" {
-			fmt.Printf("ALTER TABLE %s ALTER COLUMN DROP NOT NULL")
+			fmt.Printf("ALTER TABLE %s ALTER COLUMN %s DROP NOT NULL;\n", c.row["table_name"], c.row["column_name"])
 		} else {
-			fmt.Printf("ALTER TABLE %s ALTER COLUMN SET NOT NULL")
+			fmt.Printf("ALTER TABLE %s ALTER COLUMN %s SET NOT NULL;\n", c.row["table_name"], c.row["column_name"])
 		}
 	}
-
-	// TODO Detect not-null and nullable change
-
-	//	// if changing type
-	//	if c.row["data_type"] == "character varying" {
-	//		// varchar needs a length specified
-	//		fmt.Printf("ALTER TABLE %s ALTER COLUMN %s TYPE %s(%s);\n", c.row["table_name"], c.row["column_name"], c.row["data_type"], c.row["character_maximum_length"])
-	//	} else {
-	//		fmt.Printf("ALTER TABLE %s ALTER COLUMN %s TYPE %s;\n", c.row["table_name"], c.row["column_name"], c.row["data_type"])
-	//	}
-	//
-	//	// if changing/adding default value
-	//	fmt.Printf("ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s;\n", c.row["table_name"], c.row["column_name"], c.row["column_default"])
-	//
-	//	// if dropping default value
-	//	fmt.Printf("ALTER TABLE %s ALTER COLUMN %s DROP DEFAULT;\n", c.row["table_name"], c.row["column_name"])
-	//
-	//	// if adding not null
-	//	fmt.Printf("ALTER TABLE %s ALTER COLUMN %s SET NOT NULL;\n", c.row["table_name"], c.row["column_name"])
-	//
-	//	// if dropping not null
-	//	fmt.Printf("ALTER TABLE %s ALTER COLUMN %s DROP NOT NULL;\n", c.row["table_name"], c.row["column_name"])
-	//	return "Change"
 }
 
 /*

pgdiff.go

@@ -108,9 +108,10 @@ func doDiff(db1 Schema, db2 Schema) {
 }
 
 func usage() {
-	fmt.Fprintf(os.Stderr, "usage: %s [database flags] <genType> <tableName> <whereClause> \n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "usage: %s [database flags] <schemaType> \n", os.Args[0])
 	fmt.Fprintln(os.Stderr, `
-Copies table data as either INSERT or UPDATE statements.
+Compares the schema between two PostgreSQL databases and generates alter statements 
+to be *manually* run against the second database.
 
 [database flags]: (optional)
   -U1     : postgres user (matches psql flag)
@@ -124,14 +125,7 @@ Copies table data as either INSERT or UPDATE statements.
   -d2     : database name (matches psql flag)
   -pw2    : password for the postgres user (otherwise you'll be prompted)
 
-<genType>     : type of SQL to generate: insert, update
-
-Database connection information can be specified in two ways:
-  * Environment variables
-  * Program flags (overrides environment variables.  See above)
-  * ~/.pgpass file (for the password)
-  * Note that if password is not specified, you will be prompted.
-
+<schemaTpe> : type of schema to check: TABLE, COLUMN, FOREIGN_KEY (soon: CONSTRAINT, ROLE)
 `)
 
 	os.Exit(2)