Skip to content
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.

Sign up for GitHub

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

Fix for oracle open cursor and foreign key issue #225

Merged
merged 8 commits into from
Aug 15, 2023
Merged

Fix for oracle open cursor and foreign key issue #225

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5fd494d
fix: added close for prepared statements to adapter.go, lower case co…
Aug 3, 2023
b0f81e8
fix: updated foreign key compare for ToMermaid and ToERD functions
Aug 3, 2023
590bacd
fix: added stmt.Close for prepared statements to resolve open cursor …
Aug 3, 2023
2f7730e
corrected whitespace
Aug 3, 2023
0245923
Merge branch 'sue445:master' into master
javedashraf Aug 10, 2023
ff99929
fix: updated close statement
Aug 14, 2023
64a3b7d
fix: corrected whitespaces for linting
Aug 14, 2023
76fd9d2
fix: added close statements
Aug 14, 2023
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
6 changes: 5 additions & 1 deletion adapter/oracle/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ func (a *Adapter) GetTable(tableName string) (*db.Table, error) {
}
table.Indexes = indexes

defer stmt.Close()
javedashraf marked this conversation as resolved.
Show resolved Hide resolved
return &table, nil
}

Expand Down Expand Up @@ -137,6 +138,7 @@ func (a *Adapter) getPrimaryKeyColumns(tableName string) (mapset.Set, error) {
columns.Add(row.ColumnName)
}

defer stmt.Close()
sue445 marked this conversation as resolved.
Show resolved Hide resolved
return columns, nil
}

Expand Down Expand Up @@ -184,6 +186,7 @@ func (a *Adapter) getForeignKeys(tableName string) ([]*db.ForeignKey, error) {
foreignKeys = append(foreignKeys, foreignKey)
}

defer stmt.Close()
sue445 marked this conversation as resolved.
Show resolved Hide resolved
return foreignKeys, nil
}

Expand Down Expand Up @@ -228,7 +231,7 @@ func (a *Adapter) getIndexes(tableName string) ([]*db.Index, error) {
}
indexes = append(indexes, index)
}

defer stmt.Close()
sue445 marked this conversation as resolved.
Show resolved Hide resolved
return indexes, nil
}

Expand All @@ -254,5 +257,6 @@ func (a *Adapter) getIndexColumns(indexName string) ([]string, error) {
columns = append(columns, row.ColumnName)
}

defer stmt.Close()
sue445 marked this conversation as resolved.
Show resolved Hide resolved
return columns, nil
}
10 changes: 6 additions & 4 deletions db/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ func (s *Schema) ToErd(showIndex bool) string {

for _, table := range s.Tables {
for _, foreignKey := range table.ForeignKeys {
if tableNames.Contains(foreignKey.ToTable) {
lines = append(lines, fmt.Sprintf("%s }-- %s", table.Name, foreignKey.ToTable))
toTable := strings.ToLower(foreignKey.ToTable)
if tableNames.Contains(toTable) {
lines = append(lines, fmt.Sprintf("%s }-- %s", table.Name, toTable))
}
}
}
Expand All @@ -51,8 +52,9 @@ func (s *Schema) ToMermaid(showComment bool) string {

for _, table := range s.Tables {
for _, foreignKey := range table.ForeignKeys {
if tableNames.Contains(foreignKey.ToTable) {
lines = append(lines, fmt.Sprintf("%s ||--o{ %s : owns", foreignKey.ToTable, table.Name))
toTable := strings.ToLower(foreignKey.ToTable)
if tableNames.Contains(toTable) {
lines = append(lines, fmt.Sprintf("%s ||--o{ %s : owns", toTable, table.Name))
}
}
}
Expand Down