Compare commits

..

No commits in common. 'chicken-5' and 'master' have entirely different histories.

@ -2,16 +2,11 @@
(make-object derive-object) (make-object derive-object)
(cond-expand (import chicken scheme)
(chicken-4 (use matchable)
(import chicken scheme) (import-for-syntax chicken)
(import-for-syntax chicken) (begin-for-syntax
(use matchable) (use srfi-1))
(begin-for-syntax
(use srfi-1)))
(chicken-5
(import-for-syntax srfi-1)
(import scheme matchable (chicken syntax))))
(define-for-syntax args-without-self (define-for-syntax args-without-self
'(if (and (pair? args) (procedure? (car args))) '(if (and (pair? args) (procedure? (car args)))
@ -58,4 +53,4 @@
. ,(cadr x)) . ,(cadr x))
. ,(cddr x))))) . ,(cddr x)))))
) )

@ -1,9 +0,0 @@
((version "0.2.4")
(synopsis "SQL as S-expressions")
(author "Peter Bex, Moritz Heidkamp")
(license "BSD")
(category db)
(dependencies matchable srfi-1 srfi-13)
(test-dependencies test)
(components (extension foops)
(extension ssql (component-dependencies foops))))

@ -3,23 +3,11 @@
(ssql->sql ssql-connection scope-table find-tables ssql-compose (ssql->sql ssql-connection scope-table find-tables ssql-compose
register-sql-engine! define-operators *ansi-translator*) register-sql-engine! define-operators *ansi-translator*)
(cond-expand (import chicken scheme)
(chicken-4 (use matchable data-structures extras srfi-1 srfi-13 foops)
(import chicken scheme) (import-for-syntax chicken)
(use matchable data-structures extras srfi-1 srfi-13 foops) (begin-for-syntax
(import-for-syntax chicken) (use srfi-1 srfi-13))
(begin-for-syntax
(use srfi-1 srfi-13)))
(chicken-5
(import-for-syntax srfi-1 srfi-13 (chicken string))
(import scheme
srfi-1
srfi-13
matchable
(chicken base)
(chicken format)
(chicken string)
foops)))
(define (before? x y lst) (define (before? x y lst)
(let loop ((lst lst)) (let loop ((lst lst))

@ -1,9 +1,4 @@
(cond-expand (use test)
(chicken-4
(use test))
(chicken-5
(import test)))
(import ssql) (import ssql)
(test-group "selects" (test-group "selects"
@ -91,4 +86,4 @@
(test "IS NOT NULL" (test "IS NOT NULL"
"SELECT NOT 'foo' IS NULL" "SELECT NOT 'foo' IS NULL"
(ssql->sql #f '(select (not (null? "foo")))))) (ssql->sql #f '(select (not (null? "foo"))))))

@ -1,9 +1,4 @@
(cond-expand (use test)
(chicken-4
(use test))
(chicken-5
(import test)))
(import ssql) (import ssql)
(test-group "composition" (test-group "composition"
@ -16,4 +11,4 @@
(test "merge" (test "merge"
'(select (columns firstname lastname age) (from artists) (order firstname lastname)) '(select (columns firstname lastname age) (from artists) (order firstname lastname))
(ssql-compose #f '(select (columns firstname lastname) (order firstname)) (ssql-compose #f '(select (columns firstname lastname) (order firstname))
'((columns age) (from artists) (order lastname))))) '((columns age) (from artists) (order lastname)))))

@ -1,11 +1,7 @@
(cond-expand (load-relative "../foops")
(chicken-4
(load-relative "../foops")
(use test))
(chicken-5
(import srfi-1 test foops)))
(import foops) (import foops)
(use test)
(test-group "basic functionality" (test-group "basic functionality"
(define foo (make-object () ((bar) 'baz))) (define foo (make-object () ((bar) 'baz)))
@ -50,4 +46,4 @@
(test 'wroom (vehicle 'drive)) (test 'wroom (vehicle 'drive))
(test '(wroom wroom) (vehicle 'drive 2)) (test '(wroom wroom) (vehicle 'drive 2))
(test '(fast wroom wroom wroom) (vehicle 'drive 3 'fast))) (test '(fast wroom wroom wroom) (vehicle 'drive 3 'fast)))

@ -1,18 +1,7 @@
(cond-expand (load-relative "foops-test")
(chicken-4 (load-relative "../ssql")
(load-relative "foops-test") (load-relative "transformations-test")
(load-relative "../ssql") (load-relative "ansi-test")
(load-relative "transformations-test") (load-relative "composition-test")
(load-relative "ansi-test")
(load-relative "composition-test"))
(chicken-5
(import test (chicken platform))
(repository-path (cons ".." (repository-path)))
(load "foops-test")
(load "transformations-test")
(load "ansi-test")
(load "composition-test")))
(test-exit)
(test-exit)

@ -1,9 +1,4 @@
(cond-expand (use test)
(chicken-4
(use test))
(chicken-5
(import test)))
(import ssql) (import ssql)
(test-begin "inspection") (test-begin "inspection")
@ -44,4 +39,4 @@
(on (= roles.actor_id actors.id))) (on (= roles.actor_id actors.id)))
movies movies
(on (= movies.id roles.movie_id))))))) (on (= movies.id roles.movie_id)))))))
(test-end "scoping") (test-end "scoping")
Loading…
Cancel
Save