fmt

Author: kyleconroy

internal/endtoend/testdata/join_where_clause/postgresql/pgx/v5/query.sql

@@ -14,4 +14,4 @@ WHERE owner = $1;
 SELECT foo.*
 FROM foo
 CROSS JOIN bar
-WHERE bar.id = $2 AND owner = $1;
+WHERE bar.id = $2 AND owner = $1;

internal/endtoend/testdata/materialized_views/postgresql/pgx/v4/go/query.sql.go

@@ -1,11 +1,2 @@
-CREATE TABLE authors (
-    id   BIGSERIAL PRIMARY KEY,
-    name TEXT NOT NULL,
-    bio  TEXT
-);
-
-ALTER TABLE authors ADD COLUMN gender INTEGER NULL;
-
-CREATE MATERIALIZED VIEW authors_names as SELECT name from authors;
-
+-- name: ListAuthors :many
 SELECT * FROM authors;

internal/endtoend/testdata/materialized_views/postgresql/pgx/v4/query.sql

@@ -1,11 +1,2 @@
-CREATE TABLE authors (
-    id   BIGSERIAL PRIMARY KEY,
-    name TEXT NOT NULL,
-    bio  TEXT
-);
-
-ALTER TABLE authors ADD COLUMN gender INTEGER NULL;
-
-CREATE MATERIALIZED VIEW authors_names as SELECT name from authors;
-
+-- name: ListAuthors :many
 SELECT * FROM authors;

internal/endtoend/testdata/materialized_views/postgresql/pgx/v5/go/query.sql.go

@@ -1,11 +1,2 @@
-CREATE TABLE authors (
-    id   BIGSERIAL PRIMARY KEY,
-    name TEXT NOT NULL,
-    bio  TEXT
-);
-
-ALTER TABLE authors ADD COLUMN gender INTEGER NULL;
-
-CREATE MATERIALIZED VIEW authors_names as SELECT name from authors;
-
+-- name: ListAuthors :many
 SELECT * FROM authors;

internal/endtoend/testdata/materialized_views/postgresql/pgx/v5/query.sql

@@ -3643,6 +3643,7 @@ func convertNode(node *pg.Node) ast.Node {
 		return convertXmlSerialize(n.XmlSerialize)
 
 	default:
+		fmt.Printf("todo: %T\n", n)
 		return &ast.TODO{}
 	}
 }

internal/endtoend/testdata/materialized_views/postgresql/stdlib/query.sql

@@ -438,12 +438,21 @@ func translate(node *nodes.Node) (ast.Node, error) {
 				if err != nil {
 					return nil, err
 				}
+
+				primary := false
+				for _, con := range item.ColumnDef.Constraints {
+					if constraint, ok := con.Node.(*nodes.Node_Constraint); ok {
+						primary = constraint.Constraint.Contype == nodes.ConstrType_CONSTR_PRIMARY
+					}
+				}
+
 				create.Cols = append(create.Cols, &ast.ColumnDef{
-					Colname:   item.ColumnDef.Colname,
-					TypeName:  rel.TypeName(),
-					IsNotNull: isNotNull(item.ColumnDef) || primaryKey[item.ColumnDef.Colname],
-					IsArray:   isArray(item.ColumnDef.TypeName),
-					ArrayDims: len(item.ColumnDef.TypeName.ArrayBounds),
+					Colname:    item.ColumnDef.Colname,
+					TypeName:   rel.TypeName(),
+					IsNotNull:  isNotNull(item.ColumnDef) || primaryKey[item.ColumnDef.Colname],
+					IsArray:    isArray(item.ColumnDef.TypeName),
+					ArrayDims:  len(item.ColumnDef.TypeName.ArrayBounds),
+					PrimaryKey: primary,
 				})
 			}
 		}

internal/engine/postgresql/convert.go

@@ -39,3 +39,17 @@ type AlterTableCmd struct {
 func (n *AlterTableCmd) Pos() int {
 	return 0
 }
+
+func (n *AlterTableCmd) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	switch n.Subtype {
+	case AT_AddColumn:
+		buf.WriteString(" ADD COLUMN ")
+	case AT_DropColumn:
+		buf.WriteString(" DROP COLUMN ")
+	}
+
+	buf.astFormat(n.Def)
+}

internal/engine/postgresql/parse.go

@@ -12,3 +12,13 @@ type AlterTableStmt struct {
 func (n *AlterTableStmt) Pos() int {
 	return 0
 }
+
+func (n *AlterTableStmt) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	buf.WriteString("ALTER TABLE ")
+	buf.astFormat(n.Relation)
+	buf.astFormat(n.Table)
+	buf.astFormat(n.Cmds)
+}

internal/sql/ast/alter_table_cmd.go

@@ -9,6 +9,7 @@ type ColumnDef struct {
 	ArrayDims  int
 	Vals       *List
 	Length     *int
+	PrimaryKey bool
 
 	// From pg.ColumnDef
 	Inhcount      int
@@ -38,7 +39,10 @@ func (n *ColumnDef) Format(buf *TrackedBuffer) {
 	buf.WriteString(n.Colname)
 	buf.WriteString(" ")
 	buf.astFormat(n.TypeName)
-	if n.IsNotNull {
+	if n.PrimaryKey {
+		buf.WriteString(" PRIMARY KEY")
+	} else if n.IsNotNull {
 		buf.WriteString(" NOT NULL")
 	}
+	buf.astFormat(n.Constraints)
 }

internal/sql/ast/alter_table_stmt.go

@@ -38,6 +38,10 @@ func (n *InsertStmt) Format(buf *TrackedBuffer) {
 		buf.astFormat(n.SelectStmt)
 	}
 
+	if n.OnConflictClause != nil {
+		buf.WriteString(" ON CONFLICT DO NOTHING ")
+	}
+
 	if items(n.ReturningList) {
 		buf.WriteString(" RETURNING ")
 		buf.astFormat(n.ReturningList)

internal/sql/ast/column_def.go

@@ -30,5 +30,13 @@ func (n *JoinExpr) Format(buf *TrackedBuffer) {
 	}
 	buf.astFormat(n.Rarg)
 	buf.WriteString(" ON ")
-	buf.astFormat(n.Quals)
+	if n.Jointype == JoinTypeInner {
+		if set(n.Quals) {
+			buf.astFormat(n.Quals)
+		} else {
+			buf.WriteString("TRUE")
+		}
+	} else {
+		buf.astFormat(n.Quals)
+	}
 }

internal/sql/ast/insert_stmt.go

@@ -27,7 +27,11 @@ func (n *TypeName) Format(buf *TrackedBuffer) {
 	if items(n.Names) {
 		buf.join(n.Names, ".")
 	} else {
-		buf.WriteString(n.Name)
+		if n.Name == "int4" {
+			buf.WriteString("INTEGER")
+		} else {
+			buf.WriteString(n.Name)
+		}
 	}
 	if items(n.ArrayBounds) {
 		buf.WriteString("[]")