Merge branch 'main' into bplunkett/sql-format

Author: bplunkett-stripe

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,24 +8,24 @@ assignees: ''
 ---
 
 ### Describe the bug**
-[//]: # A clear and concise description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
 
 ### Expected behavior**
-[//]: # A clear and concise description of what you expected to happen.
+<!-- A clear and concise description of what you expected to happen. -->
 
 ### To Reproduce
-[//]: # Steps to reproduce the behavior:
-[//]: # 1. Go to '...'
-[//]: # 2. Click on '....'
-[//]: # 3. Scroll down to '....'
-[//]: # 4. See error
+<!-- Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error -->
 
 ### Context 
-[//]: # Fetch from "pg-schema-diff version" if using the CLI or go.mod if using the library
+<!-- Fetch from "pg-schema-diff version" if using the CLI or go.mod if using the library -->
 pg-schema-diff version: Some sha or version
-[//]: # If you are using the CLI or using the library programatically
+<!-- If you are using the CLI or using the library programatically -->
 pg-schema-diff usage: [CLI | LIBRARY]
 Postgres version: [14, 15, 16, 17]
-[//]: # Only if relevant
+<!-- Only if relevant -->
 pg_dump of database: Gist link
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 ### Describe the feature
-[//]: # Provide a thorough description of the feature. If possible, include examples of  the feature and its behavior. For example, if it's a new command flag, provide examples of using the command flag and expected outputs.
+<!-- Provide a thorough description of the feature. If possible, include examples of  the feature and its behavior. For example, if it's a new command flag, provide examples of using the command flag and expected outputs. -->
 
 ### Motivation
-[//]: # Describe why you want this feature. This is important for assessing the priority of the feature and if alternative solutions exist.
+<!-- Describe why you want this feature. This is important for assessing the priority of the feature and if alternative solutions exist. -->

.github/pull_request_template.md

@@ -1,10 +1,10 @@
-[//]: # README: Ensure you've read the CONTRIBUTING.MD and that your commits are signed
+<!-- README: Ensure you've read the CONTRIBUTING.MD and that your commits are signed -->
 
 ### Description
-[//]: # A clear and concise description of the purpose of this Pull Request. What is being changed? Include any relevant background for this change.
+<!-- A clear and concise description of the purpose of this Pull Request. What is being changed? Include any relevant background for this change. -->
 
 ### Motivation
-[//]: # Why you made these changes. Link to any relevant issues.
+<!-- Why you made these changes. Link to any relevant issues. -->
 
 ### Testing
-[//]: # Describe how you tested these changes
+<!-- Describe how you tested these changes -->

.sqlfluff

@@ -1,6 +1,7 @@
 [sqlfluff]
 dialect = postgres
 templater = placeholder
+large_file_skip_byte_limit = 0
 
 [sqlfluff:templater:placeholder]
 param_regex = sqlc.arg\(.*\)

README.md

@@ -171,12 +171,11 @@ for _, stmt := range plan.Statements {
 ```
 
 # Supported Postgres versions
-Supported: 14, 15, 16, 17  
+Supported: 14, 15, 16, 17
 Unsupported: <= 13  are not supported. Use at your own risk.
 
 # Unsupported migrations
 An abridged list of unsupported migrations:
-- Views (Planned)
 - Privileges (Planned)
 - Types (Only enums are currently supported)
 - Renaming. The diffing library relies on names to identify the old and new versions of a table, index, etc. If you rename

cmd/pg-schema-diff/apply_cmd_test.go

@@ -78,9 +78,9 @@ func (suite *cmdTestSuite) TestApplyCmd() {
 			})
 			// The migration should have been successful. Assert it was.
 			expectedDb := tempDbWithSchema(suite.T(), suite.pgEngine, tc.expectedSchemaDDL)
-			expectedDbDump, err := pgdump.GetDump(expectedDb, pgdump.WithSchemaOnly())
+			expectedDbDump, err := pgdump.GetDump(expectedDb, pgdump.WithSchemaOnly(), pgdump.WithRestrictKey(pgdump.FixedRestrictKey))
 			suite.Require().NoError(err)
-			fromDbDump, err := pgdump.GetDump(fromDb, pgdump.WithSchemaOnly())
+			fromDbDump, err := pgdump.GetDump(fromDb, pgdump.WithSchemaOnly(), pgdump.WithRestrictKey(pgdump.FixedRestrictKey))
 			suite.Require().NoError(err)
 
 			suite.Equal(expectedDbDump, fromDbDump)

cmd/pg-schema-diff/datastructs.go

@@ -3,6 +3,8 @@ package main
 import (
 	"fmt"
 	"sort"
+
+	"github.com/stripe/pg-schema-diff/internal/util"
 )
 
 func mustGetAndDeleteKey(m map[string]string, key string) (string, error) {
@@ -15,10 +17,7 @@ func mustGetAndDeleteKey(m map[string]string, key string) (string, error) {
 }
 
 func keys(m map[string]string) []string {
-	var vals []string
-	for k := range m {
-		vals = append(vals, k)
-	}
+	vals := util.Keys(m)
 	sort.Strings(vals)
 	return vals
 }

cmd/pg-schema-diff/datastructs_test.go

@@ -6,6 +6,7 @@ require (
 	github.com/go-logfmt/logfmt v0.6.0
 	github.com/google/go-cmp v0.5.9
 	github.com/google/uuid v1.3.0
+	github.com/hashicorp/go-version v1.7.0
 	github.com/jackc/pgx/v4 v4.18.2
 	github.com/kr/pretty v0.3.1
 	github.com/lib/pq v1.10.2

go.mod

@@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
+github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=