Skip to content

Bug fix to index relation creation bug #1640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- name: Placeholder :exec
SELECT 1;
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CREATE TABLE temp(a TEXT);

CREATE INDEX temp_idx ON temp(a);
ALTER INDEX temp_idx ATTACH PARTITION temp_partition_idx;
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "1",
"packages": [
{
"path": "go",
"engine": "postgresql",
"sql_package": "pgx/v4",
"name": "querytest",
"schema": "schema.sql",
"queries": "query.sql"
}
]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- name: Placeholder :exec
SELECT 1;
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CREATE TABLE temp(a TEXT);

CREATE INDEX temp_idx ON temp(a);
ALTER INDEX temp_idx ATTACH PARTITION temp_partition_idx;

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": "1",
"packages": [
{
"path": "go",
"engine": "postgresql",
"name": "querytest",
"schema": "schema.sql",
"queries": "query.sql"
}
]
}
52 changes: 25 additions & 27 deletions internal/sql/catalog/table.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,94 +19,76 @@ type Table struct {
}

func (table *Table) isExistColumn(cmd *ast.AlterTableCmd) (int, error) {

for i, c := range table.Columns {
if c.Name == *cmd.Name {
return i, nil
}
}

if !cmd.MissingOk {
return -1, sqlerr.ColumnNotFound(table.Rel.Name, *cmd.Name)
}

// Missing column is allowed
return -1, nil
}

func (table *Table) addColumn(cmd *ast.AlterTableCmd) error {

for _, c := range table.Columns {
if c.Name == cmd.Def.Colname {
return sqlerr.ColumnExists(table.Rel.Name, c.Name)
}
}

table.Columns = append(table.Columns, &Column{
Name: cmd.Def.Colname,
Type: *cmd.Def.TypeName,
IsNotNull: cmd.Def.IsNotNull,
IsArray: cmd.Def.IsArray,
Length: cmd.Def.Length,
})

return nil
}

func (table *Table) alterColumnType(cmd *ast.AlterTableCmd) error {

index, err := table.isExistColumn(cmd)
if err != nil {
return err
}

if index >= 0 {
table.Columns[index].Type = *cmd.Def.TypeName
table.Columns[index].IsArray = cmd.Def.IsArray
}

return nil
}

func (table *Table) dropColumn(cmd *ast.AlterTableCmd) error {

index, err := table.isExistColumn(cmd)
if err != nil {
return err
}

if index >= 0 {
table.Columns = append(table.Columns[:index], table.Columns[index+1:]...)
}

return nil
}

func (table *Table) dropNotNull(cmd *ast.AlterTableCmd) error {

index, err := table.isExistColumn(cmd)
if err != nil {
return err
}

if index >= 0 {
table.Columns[index].IsNotNull = false
}

return nil
}

func (table *Table) setNotNull(cmd *ast.AlterTableCmd) error {

index, err := table.isExistColumn(cmd)
if err != nil {
return err
}

if index >= 0 {
table.Columns[index].IsNotNull = true
}

return nil
}

Expand All @@ -130,41 +112,57 @@ type columnGenerator interface {
}

func (c *Catalog) getTable(tableName *ast.TableName) (*Schema, *Table, error) {

schemaName := tableName.Schema

if schemaName == "" {
schemaName = c.DefaultSchema
}

var schema *Schema

for i := range c.Schemas {
if c.Schemas[i].Name == schemaName {
schema = c.Schemas[i]
break
}
}

if schema == nil {
return nil, nil, sqlerr.SchemaNotFound(schemaName)
}

table, _, err := schema.getTable(tableName)
if err != nil {
return nil, nil, err
}

return schema, table, nil
}

func (c *Catalog) alterTable(stmt *ast.AlterTableStmt) error {
func isStmtImplemented(stmt *ast.AlterTableStmt) bool {
var implemented bool
for _, item := range stmt.Cmds.Items {
switch cmd := item.(type) {
case *ast.AlterTableCmd:
switch cmd.Subtype {
case ast.AT_AddColumn:
implemented = true
case ast.AT_AlterColumnType:
implemented = true
case ast.AT_DropColumn:
implemented = true
case ast.AT_DropNotNull:
implemented = true
case ast.AT_SetNotNull:
implemented = true
}
}
}
return implemented
}

func (c *Catalog) alterTable(stmt *ast.AlterTableStmt) error {
if !isStmtImplemented(stmt) {
return nil
}
_, table, err := c.getTable(stmt.Table)
if err != nil {
return err
}

for _, item := range stmt.Cmds.Items {
switch cmd := item.(type) {
case *ast.AlterTableCmd:
Expand Down