diff --git a/Gopkg.lock b/Gopkg.lock index 40ae2c1..3f34973 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,56 +2,76 @@ [[projects]] + digest = "1:282acb7fe0ca456de4ea5c3174c2691a2bd74008462e966b69094ad0b2c23e6e" name = "github.com/BurntSushi/toml" packages = ["."] + pruneopts = "UT" revision = "b26d9c308763d68093482582cea63d69be07a0f0" version = "v0.3.0" [[projects]] branch = "master" + digest = "1:ce2707d71c2bcb8f5862d4d6460dceb7f5a9a6c9a9226b62a7046e5fd3243d86" name = "github.com/achiku/varfmt" packages = ["."] + pruneopts = "UT" revision = "f820e1efecee3c7b75ef5b95e4481af31bf143c5" [[projects]] branch = "master" + digest = "1:45a787c1adea69a03a5384865b307c7a72bb28bd5844bd57679d889a726a588b" name = "github.com/alecthomas/template" packages = [ ".", - "parse" + "parse", ] + pruneopts = "UT" revision = "a0175ee3bccc567396460bf5acd36800cb10c49c" [[projects]] branch = "master" + digest = "1:c198fdc381e898e8fb62b8eb62758195091c313ad18e52a3067366e1dda2fb3c" name = "github.com/alecthomas/units" packages = ["."] + pruneopts = "UT" revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a" [[projects]] branch = "master" + digest = "1:feb4df382b109772e34b8473d2b48e55a7c82b731887b64b3c4b6bda7a0d62b4" name = "github.com/lib/pq" packages = [ ".", - "oid" + "oid", ] + pruneopts = "UT" revision = "88edab0803230a3898347e77b474f8c1820a1f20" [[projects]] + digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" name = "github.com/pkg/errors" packages = ["."] + pruneopts = "UT" revision = "645ef00459ed84a119197bfb8d8205042c6df63d" version = "v0.8.0" [[projects]] + digest = "1:c06d9e11d955af78ac3bbb26bd02e01d2f61f689e1a3bce2ef6fb683ef8a7f2d" name = "gopkg.in/alecthomas/kingpin.v2" packages = ["."] + pruneopts = "UT" revision = "947dcec5ba9c011838740e680966fd7087a71d0d" version = "v2.2.6" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "40eee611acad57cf5425cdd3f00295679a7326b567e7c9d1ecb744d6761466a9" + input-imports = [ + "github.com/BurntSushi/toml", + "github.com/achiku/varfmt", + "github.com/lib/pq", + "github.com/pkg/errors", + "gopkg.in/alecthomas/kingpin.v2", + ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/README.md b/README.md index 2970657..ba051cb 100644 --- a/README.md +++ b/README.md @@ -186,3 +186,15 @@ func GetT3ByPk(db Queryer, pk0 int, pk1 int) (*T3, error) { return &r, nil } ``` + +## Test + +``` +$ psql -d template1 +> CREATE USER dgw_test; +> CREATE DATABASE dgw_test OWNER dgw_test; +> \q +$ go get -u github.com/golang/dep/cmd/dep +$ dep ensure +$ go test +``` diff --git a/dgw.go b/dgw.go index c399e18..f499315 100644 --- a/dgw.go +++ b/dgw.go @@ -65,8 +65,7 @@ SELECT WHEN 'int8'::regtype THEN 'bigserial' WHEN 'int2'::regtype THEN 'smallserial' END - WHEN a.atttypid = ANY ('{uuid}'::regtype[]) - AND COALESCE(pg_get_expr(ad.adbin, ad.adrelid), '') != '' + WHEN a.atttypid = ANY ('{uuid}'::regtype[]) AND COALESCE(pg_get_expr(ad.adbin, ad.adrelid), '') != '' THEN 'autogenuuid' ELSE format_type(a.atttypid, a.atttypmod) END AS data_type