Skip to content

Commit 8fa9fa1

Browse files
committed
FIX units are not loaded
Previous commit introduced a regression where unit definitions would not be properly set and propagated.
1 parent 4c13d59 commit 8fa9fa1

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

function.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ func LoadFunctions() ( err error ) {
1717
files, err := ResolveDependencies( Cfg.FunctionFiles, Cfg.SqlDirPath + "functions" )
1818
if err != nil { return err }
1919

20-
functions := make( []Function, 0 )
20+
functions := make( []*Function, 0 )
2121
for i := len( files ) - 1 ; i >= 0 ; i-- {
2222
file := files[ i ]
2323
function := Function{}
2424
function.Path = file
25+
functions = append( functions, &function )
2526

2627
err = DownPass( &function, function.Path )
2728
if err != nil {
@@ -34,7 +35,7 @@ func LoadFunctions() ( err error ) {
3435
for i := len( functions ) - 1 ; i >= 0 ; i-- {
3536
function := functions[ i ]
3637
if _, ignore := bypass[ function.Path ] ; ! ignore {
37-
err = UpPass( &function, function.Path )
38+
err = UpPass( function, function.Path )
3839
if err != nil {
3940
successfulCount--
4041
errors = append( errors, fmt.Sprintf( "%v\n", err ) )

trigger.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ func LoadTriggers() ( err error ) {
1717
files, err := ResolveDependencies( Cfg.TriggerFiles, Cfg.SqlDirPath + "triggers" )
1818
if err != nil { return err }
1919

20-
triggers := make( []Trigger, 0 )
20+
triggers := make( []*Trigger, 0 )
2121
for i := len( files ) - 1 ; i >= 0 ; i-- {
2222
file := files[ i ]
2323
trigger := Trigger{}
2424
trigger.Path = file
25+
triggers = append( triggers, &trigger )
2526

2627
err = DownPass( &trigger, trigger.Path )
2728
if err != nil {
@@ -34,7 +35,7 @@ func LoadTriggers() ( err error ) {
3435
for i := len( triggers ) - 1 ; i >= 0 ; i-- {
3536
trigger := triggers[ i ]
3637
if _, ignore := bypass[ trigger.Path ] ; ! ignore {
37-
err = UpPass( &trigger, trigger.Path )
38+
err = UpPass( trigger, trigger.Path )
3839
if err != nil {
3940
successfulCount--
4041
errors = append( errors, fmt.Sprintf( "%v\n", err ) )

type.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ func LoadTypes() ( err error ) {
1717
files, err := ResolveDependencies( Cfg.TypeFiles, Cfg.SqlDirPath + "types" )
1818
if err != nil { return err }
1919

20-
pgtypes := make( []Type, 0 )
20+
pgtypes := make( []*Type, 0 )
2121
for i := len( files ) - 1 ; i >= 0 ; i-- {
2222
file := files[ i ]
2323
pgtype := Type{}
2424
pgtype.Path = file
25+
pgtypes = append( pgtypes, &pgtype )
2526

2627
err = DownPass( &pgtype, pgtype.Path )
2728
if err != nil {
@@ -34,7 +35,7 @@ func LoadTypes() ( err error ) {
3435
for i := len( pgtypes ) - 1 ; i >= 0 ; i-- {
3536
pgtype := pgtypes[ i ]
3637
if _, ignore := bypass[ pgtype.Path ] ; ! ignore {
37-
err = UpPass( &pgtype, pgtype.Path )
38+
err = UpPass( pgtype, pgtype.Path )
3839
if err != nil {
3940
successfulCount--
4041
errors = append( errors, fmt.Sprintf( "%v\n", err ) )

view.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ func LoadViews() ( err error ) {
1717
files, err := ResolveDependencies( Cfg.ViewFiles, Cfg.SqlDirPath + "views" )
1818
if err != nil { return err }
1919

20-
views := make( []View, 0 )
20+
views := make( []*View, 0 )
2121
for i := len( files ) - 1 ; i >= 0 ; i-- {
2222
file := files[ i ]
2323
view := View{}
2424
view.Path = file
25+
views = append( views, &view )
2526

2627
err = DownPass( &view, view.Path )
2728
if err != nil {
@@ -34,7 +35,7 @@ func LoadViews() ( err error ) {
3435
for i := len( views ) - 1 ; i >= 0 ; i-- {
3536
view := views[ i ]
3637
if _, ignore := bypass[ view.Path ] ; ! ignore {
37-
err = UpPass( &view, view.Path )
38+
err = UpPass( view, view.Path )
3839
if err != nil {
3940
successfulCount--
4041
errors = append( errors, fmt.Sprintf( "%v\n", err ) )

0 commit comments

Comments
 (0)