From 9c0d887a3caddbcee9b4d85c414ebb09db91c54f Mon Sep 17 00:00:00 2001 From: Dan Sosedoff Date: Tue, 30 Jan 2018 22:34:54 -0600 Subject: [PATCH 1/3] List name and definition for table constraints --- pkg/statements/sql.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/statements/sql.go b/pkg/statements/sql.go index 97bbd2b..1596591 100644 --- a/pkg/statements/sql.go +++ b/pkg/statements/sql.go @@ -50,7 +50,8 @@ WHERE TableConstraints = ` SELECT - pg_get_constraintdef(c.oid, true) as condef + conname as name, + pg_get_constraintdef(c.oid, true) as definition FROM pg_constraint c JOIN From b0146a5a7608811e94b837dc0b5fe964e771d078 Mon Sep 17 00:00:00 2001 From: Dan Sosedoff Date: Tue, 30 Jan 2018 22:41:12 -0600 Subject: [PATCH 2/3] Update test case to handle the constraint result rows --- pkg/client/client_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go index 1efd53c..79c985d 100644 --- a/pkg/client/client_test.go +++ b/pkg/client/client_test.go @@ -266,8 +266,9 @@ func test_TableConstraints(t *testing.T) { res, err := testClient.TableConstraints("editions") assert.Equal(t, nil, err) - assert.Equal(t, 1, len(res.Columns)) - assert.Equal(t, 2, len(res.Rows)) + assert.Equal(t, []string{"name", "definition"}, res.Columns) + assert.Equal(t, Row{"pkey", "PRIMARY KEY (isbn)"}, res.Rows[0]) + assert.Equal(t, Row{"integrity", "CHECK (book_id IS NOT NULL AND edition IS NOT NULL)"}, res.Rows[1]) } func test_Query(t *testing.T) { From f44b436bc1334c8dde261cc0ff94b5966608d2b4 Mon Sep 17 00:00:00 2001 From: Dan Sosedoff Date: Tue, 30 Jan 2018 23:20:19 -0600 Subject: [PATCH 3/3] Update travis config per recommendation --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ebba98e..0f282db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ sudo: required +dist: trusty +group: deprecated-2017Q4 language: go