Closed vindarel closed 3 years ago
Hi, it would be nice to replace Optima with Trivia.
That's probably all there is to it:
From 8c863b3bd86d443059a341f42abbfe780b8113c6 Mon Sep 17 00:00:00 2001 From: vindarel <vindarel@mailz.org> Date: Fri, 4 Jun 2021 13:45:15 +0200 Subject: [PATCH] optima -> trivia ---From 9697385cd9867b287b9d4f5def1a316ba38bbeec Mon Sep 17 00:00:00 2001 From: vindarel <vindarel@mailz.org> Date: Fri, 4 Jun 2021 13:45:15 +0200 Subject: [PATCH] optima -> trivia --- src/sxql.lisp | 7 +++---- sxql.asd | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/sxql.lisp b/src/sxql.lisp index 6b593ba..14d8eb8 100644 --- a/src/sxql.lisp +++ b/src/sxql.lisp @@ -3,8 +3,7 @@ (:use :cl :sxql.statement :sxql.composed-statement - :sxql.clause - :optima) + :sxql.clause) (:shadow :primary-key :foreign-key :key) @@ -68,7 +67,7 @@ @export (defmacro select (fields &body clauses) `(make-statement :select - ,(match fields + ,(trivia:match fields ((or (list* (type keyword) _) (list* (list* (type keyword) _) _)) `(make-clause :fields @@ -160,7 +159,7 @@ `(make-clause :fields ,@(mapcar #'expand-op fields))) (defun convert-if-fields-clause (clause) - (match clause + (trivia:match clause ((or (list* (type keyword) _) (list* (list* (type keyword) _) _)) (apply #'make-clause :fields clause)) diff --git a/sxql.asd b/sxql.asd index 5fbd88b..c909445 100644 --- a/sxql.asd +++ b/sxql.asd @@ -16,7 +16,7 @@ :version "0.1.0" :author "Eitaro Fukamachi" :license "BSD 3-Clause" - :depends-on (:optima + :depends-on (:trivia :iterate :cl-syntax-annot :trivial-types -- 2.17.1
thanks
Thank you for your patch!
Hi, it would be nice to replace Optima with Trivia.
That's probably all there is to it:
thanks