Final 0.9.1 commit

Former-commit-id: 54e0c74

Author: joncrlsn

README.md

@@ -2,35 +2,46 @@
 
 pgdiff compares the schema between two PostgreSQL 9 databases and generates alter statements to be *manually* run against the second database to make them match.  The provided pgdiff.sh script helps automate the process.  
 
-pgdiff is transparent in what it does, so it never modifies a database directly. You alone are responsible for verifying the generated SQL *before* running it against your database, so you can have confidence that pgdiff is safe to try and see what SQL gets generated.
+pgdiff is transparent in what it does, so it never modifies a database directly. You alone are responsible for verifying the generated SQL before running it against your database.  Go ahead and see what SQL gets generated.
+
+pgdiff is written to be easy to expand and improve the accuracy of the diff.
 
-pgdiff is written to be easy to improve the accuracy of the diff.  If you find something that seems wrong and you want me to look at it, please send me two schema-only database dumps that I can test with (Use the --schema-only option with pg\_dump)
 
 ### download
-[osx](https://github.com/joncrlsn/pgrun/raw/master/bin-osx/pgdiff "OSX version")
-[linux](https://github.com/joncrlsn/pgrun/raw/master/bin-linux/pgdiff "Linux version")
-[windows](https://github.com/joncrlsn/pgrun/raw/master/bin-win/pgdiff.exe "Windows version")
+[osx](https://github.com/joncrlsn/pgrun/raw/master/bin-osx/pgdiff "OSX version")   [linux](https://github.com/joncrlsn/pgrun/raw/master/bin-linux/pgdiff "Linux version")    [windows](https://github.com/joncrlsn/pgrun/raw/master/bin-win/pgdiff.exe "Windows version")
+
 
 ### usage
-	pgdiff [options] <schemaType>
+	pgdiff [options] <schemaType>
 
  (where options are defined below and &lt;schemaType&gt; can be: ROLE, SEQUENCE, TABLE, COLUMN, INDEX, FUNCTION, VIEW, FOREIGN\_KEY, OWNER, GRANT\_RELATIONSHIP, GRANT\_ATTRIBUTE, TRIGGER)
 
-I've found that there is an ideal order for running the different schema types.  For example, you'll always want to add new tables before you add new columns.  This is the order that has worked for me, however "your mileage may vary".
+I've found that there is an ideal order for running the different schema types.  This order should minimize the problems you encounter.  For example, you'll always want to add new tables before you add new columns.  This is the order that has worked for me, however "your mileage may vary".
 
 1. FUNCTION
 1. ROLE
 1. SEQUENCE
 1. TABLE
+1. COLUMN
 1. VIEW
 1. OWNER
-1. COLUMN
 1. INDEX
 1. FOREIGN\_KEY
 1. GRANT\_RELATIONSHIP
 1. GRANT\_ATTRIBUTE
 1. TRIGGER
 
+
+### example
+I have found it helpful to take ```--schema-only``` dumps of the databases in question, load them into a local postgres, then do my sql generation and testing there before running the SQL against a more official database. Your local postgres instance will need the correct users/roles populated because db dumps don't copy that information.
+
+```
+pgdiff -U dbuser -H localhost -D refDB  -O 'sslmode=disable' \
+       -u dbuser -h localhost -d compDB -o 'sslmode=disable' \
+       TABLE 
+```
+
+
 ### options
 
 options           | explanation 
@@ -51,12 +62,30 @@ options           | explanation
   -o, --option2   | second db options. example: sslmode=disable
 
 
+### getting started on linux and osx
+linux and osx binaries are packaged with an extra, optional bash script and pgrun program that helps speed the diffing process. 
+1. download the tgz file for your OS
+1. untar it:  ```tar -xzvf pgdiff.tgz```
+1. cd to the new pgdiff directory
+1. edit the db connection defaults in pgdiff.sh 
+1. ...or manually run pgdiff for each schema type listed in the usage section above
+1. review the SQL output for each schema type and, if you want to make them match, run it against db2 
+
+
+### getting started on windows
+1. download pgdiff.exe from the bin-win directory on github
+1. edit the db connection defaults in pgdiff.sh or...
+1. manually run pgdiff for each schema type listed in the usage section above
+1. review the SQL output and, if you want to make them match, run it against db2 
+
+
 ### version history
 1. 0.9.0 - Implemented ROLE, SEQUENCE, TABLE, COLUMN, INDEX, FOREIGN\_KEY, OWNER, GRANT\_RELATIONSHIP, GRANT\_ATTRIBUTE
 1. 0.9.1 - Added VIEW, FUNCTION, and TRIGGER (Thank you, Shawn Carroll AKA SparkeyG)
 
+
 ### todo
 1. fix SQL for adding an array column
 1. add windows version of pgdiff.sh (or even better: re-write it in Go)
-1. allow editing of individual SQL lines after failure (this would be done in the script pgdiff.sh)
+1. allow editing of individual SQL lines after failure (this would probably be done in the script pgdiff.sh)
 1. store failed SQL statements in an error file for later fixing and rerunning?

bin-linux/pgdiff.tgz.REMOVED.git-id

@@ -1 +1 @@
-b33644e000965e421a9c120a899ac60ad17eab46
+bc4346731208e5b88b3fbbbaf027dfc557471e8c

bin-osx/pgdiff.tgz.REMOVED.git-id

@@ -1 +1 @@
-b9845f185d9d08d675362c1e59d30a1eb077cbb6
+cb71ed6dbe48377ffce0cd089954f7014d23aaf1

bin-win/pgdiff.exe.REMOVED.git-id

@@ -1 +1 @@
-ca1230a10b8dcd2278742126b62acbaf0d153201
+d83feab2c337fca7826fb4a10152068b73c1e425

build.sh

@@ -1,4 +1,10 @@
 #!/bin/bash -x
+#
+# For OSX and Linux, this script:
+#  * builds pgdiff 
+#  * downloads pgrun 
+#  * combines them and pgdiff.sh into a tgz file
+#
 
 SCRIPT_DIR="$(dirname `ls -l $0 | awk '{ print $NF }'`)"
 
@@ -45,7 +51,7 @@ if [[ -d bin-osx ]]; then
     COPYFILE_DISABLE=true tar -cvzf "${APPNAME}.tgz" $APPNAME
     cd -
     mv "${tempdir}/${APPNAME}.tgz" "${SCRIPT_DIR}/bin-osx/"
-    echo "Built osx32."
+    echo "Built osx."
 else
     echo "Skipping osx.  No bin-osx directory."
 fi

index.go

@@ -227,9 +227,9 @@ JOIN pg_catalog.pg_class AS c ON (c.oid = i.indrelid)
 JOIN pg_catalog.pg_class AS c2 ON (c2.oid = i.indexrelid)
 LEFT JOIN pg_catalog.pg_constraint con
     ON (con.conrelid = i.indrelid AND con.conindid = i.indexrelid AND con.contype IN ('p','u','x'))
+JOIN pg_catalog.pg_namespace AS n ON (c2.relnamespace = n.oid)
 WHERE c.relname NOT LIKE 'pg_%'
---AND c.relname = 't_org'
---ORDER BY c.relname, c2.relname;
+AND n.nspname = 'public';
 `
 	rowChan1, _ := pgutil.QueryStrings(conn1, sql)
 	rowChan2, _ := pgutil.QueryStrings(conn2, sql)

pgdiff.sh

@@ -45,7 +45,7 @@ function rundiff() {
     vi "$sqlFile"
     echo -n "Do you wish to run this against ${NAME2}? [yN]: "; read x
     if [[ $x =~ ^y ]]; then
-       PGPASSWORD="$PASS2" pgrun -U $USER2 -h $HOST2 -d $NAME2 -O "$OPT2" -f "$sqlFile"
+       PGPASSWORD="$PASS2" ./pgrun -U $USER2 -h $HOST2 -d $NAME2 -O "$OPT2" -f "$sqlFile"
     fi
     echo
 }
@@ -54,9 +54,9 @@ rundiff FUNCTION
 rundiff ROLE
 rundiff SEQUENCE
 rundiff TABLE
+rundiff COLUMN
 rundiff VIEW
 rundiff OWNER
-rundiff COLUMN
 rundiff INDEX
 rundiff FOREIGN_KEY
 rundiff GRANT_RELATIONSHIP