commit 133e4a3c99a97b6c363df74afb608a537242cb62 · nel.pet/core

+23 -2
appview/db/pulls.go
···

       63
       63
        
       	State        PullState

     

       64
       64
        
       	Submissions  []*PullSubmission

     

       65
       65
        
       

     

       66
       66
       +
       	// stacking

     

       67
       67
       +
       	StackId        string // nullable string

     

       68
       68
       +
       	ChangeId       string // nullable string

     

       69
       69
       +
       	ParentChangeId string // nullable string

     

       70
       70
       +
       

     

       66
       71
        
       	// meta

     

       67
       72
        
       	Created    time.Time

     

       68
       73
        
       	PullSource *PullSource

     
···

       480
       485
        
       			body,

     

       481
       486
        
       			rkey,

     

       482
       487
        
       			source_branch,

     

       483
       483
       -
       			source_repo_at

     

       488
       488
       +
       			source_repo_at,

     

       489
       489
       +
       			stack_id,

     

       490
       490
       +
       			change_id,

     

       491
       491
       +
       			parent_change_id

     

       484
       492
        
       		from

     

       485
       493
        
       			pulls

     

       486
       494
        
       		where

     
···

       490
       498
        
       

     

       491
       499
        
       	var pull Pull

     

       492
       500
        
       	var createdAt string

     

       493
       493
       -
       	var sourceBranch, sourceRepoAt sql.NullString

     

       501
       501
       +
       	var sourceBranch, sourceRepoAt, stackId, changeId, parentChangeId sql.NullString

     

       494
       502
        
       	err := row.Scan(

     

       495
       503
        
       		&pull.OwnerDid,

     

       496
       504
        
       		&pull.PullId,

     
···

       503
       511
        
       		&pull.Rkey,

     

       504
       512
        
       		&sourceBranch,

     

       505
       513
        
       		&sourceRepoAt,

     

       514
       514
       +
       		&stackId,

     

       515
       515
       +
       		&changeId,

     

       516
       516
       +
       		&parentChangeId,

     

       506
       517
        
       	)

     

       507
       518
        
       	if err != nil {

     

       508
       519
        
       		return nil, err

     
···

       526
       537
        
       			}

     

       527
       538
        
       			pull.PullSource.RepoAt = &sourceRepoAtParsed

     

       528
       539
        
       		}

     

       540
       540
       +
       	}

     

       541
       541
       +
       

     

       542
       542
       +
       	if stackId.Valid {

     

       543
       543
       +
       		pull.StackId = stackId.String

     

       544
       544
       +
       	}

     

       545
       545
       +
       	if changeId.Valid {

     

       546
       546
       +
       		pull.ChangeId = changeId.String

     

       547
       547
       +
       	}

     

       548
       548
       +
       	if parentChangeId.Valid {

     

       549
       549
       +
       		pull.ParentChangeId = parentChangeId.String

     

       529
       550
        
       	}

     

       530
       551
        
       

     

       531
       552
        
       	submissionsQuery := `