Skip to content

Commit

Permalink
fix default
Browse files Browse the repository at this point in the history
  • Loading branch information
alishakawaguchi committed Jul 31, 2024
1 parent b9a4a43 commit a70d889
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions backend/gen/go/db/dbschemas/mysql/system.sql.go

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

2 changes: 1 addition & 1 deletion backend/pkg/dbschemas/sql/mysql/queries/system.sql
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SELECT
c.table_name,
c.column_name,
c.ordinal_position,
COALESCE(c.column_default, 'NULL') as column_default, -- must coalesce because sqlc doesn't appear to work for system structs to output a *string
IFNULL(REPLACE(REPLACE(REPLACE(REPLACE(c.COLUMN_DEFAULT, '_utf8mb4\\\'', '_utf8mb4\''), '_utf8mb3\\\'', '_utf8mb3\''), '\\\'', '\''), '\\\'', '\''), '') AS column_default, -- hack to fix this bug https://bugs.mysql.com/bug.php?
c.is_nullable,
c.data_type,
c.character_maximum_length,
Expand Down
6 changes: 5 additions & 1 deletion backend/pkg/sqlmanager/mysql/mysql-manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,16 @@ func (m *MysqlManager) GetDatabaseSchema(ctx context.Context) ([]*sqlmanager_sha
generatedTypeCopy := row.Extra.String
generatedType = &generatedTypeCopy
}
columnDefaultStr, err := convertUInt8ToString(row.ColumnDefault)
if err != nil {
return nil, err
}
result = append(result, &sqlmanager_shared.DatabaseSchemaRow{
TableSchema: row.TableSchema,
TableName: row.TableName,
ColumnName: row.ColumnName,
DataType: row.DataType,
ColumnDefault: row.ColumnDefault,
ColumnDefault: columnDefaultStr,
IsNullable: row.IsNullable,
GeneratedType: generatedType,
})
Expand Down

0 comments on commit a70d889

Please sign in to comment.