Megatest

Check-in [949d5407db]
Login
Overview
Comment:Fixed environment delta code
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.65
Files: files | file ages | folders
SHA1: 949d5407dbad5db056abd5b028a9cdce2c3eae58
User & Date: jmoon18 on 2018-06-29 17:46:00
Other Links: branch diff | manifest | tags
Context
2018-06-29
17:47
Mid-stream update to add area-script capability to triggers check-in: 6f7d6654c5 user: jmoon18 tags: v1.65
17:46
Fixed environment delta code check-in: 949d5407db user: jmoon18 tags: v1.65
2018-06-26
15:22
Changed mis-spelling in error message for envdelta check-in: 6139430731 user: jmoon18 tags: v1.65
Changes

Modified env.scm from [9fe24952ae] to [058c0a7117].

115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
    (query
     (for-each-row
      (lambda (row)
	(let ((var  (car row))
	      (val  (cadr row)))
	  (hash-table-set! result var val))))
     (sql db "SELECT var,val FROM envvars AS a WHERE context=? AND val != (SELECT val FROM envvars WHERE var=a.var AND context=?)")
     contexta contextb)
    result))

;;
(define (env:blind-merge l1 l2)
  (if (null? l1) l2
      (if (null? l2) l1
	  (cons (car l1) (cons (car l2) (env:blind-merge (cdr l1) (cdr l2)))))))







|







115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
    (query
     (for-each-row
      (lambda (row)
	(let ((var  (car row))
	      (val  (cadr row)))
	  (hash-table-set! result var val))))
     (sql db "SELECT var,val FROM envvars AS a WHERE context=? AND val != (SELECT val FROM envvars WHERE var=a.var AND context=?)")
     contextb contexta)
    result))

;;
(define (env:blind-merge l1 l2)
  (if (null? l1) l2
      (if (null? l2) l1
	  (cons (car l1) (cons (car l2) (env:blind-merge (cdr l1) (cdr l2)))))))