branch: elpa/emacsql commit e900f990910e6447966e7ee91f27494b3ff204d9 Author: Christopher Wellons <well...@nullprogram.com> Commit: Christopher Wellons <well...@nullprogram.com>
Update examples. --- README.md | 13 +++++++++---- emacsql.el | 9 +++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 560959af0f..d189cbbe10 100644 --- a/README.md +++ b/README.md @@ -27,15 +27,20 @@ Requires Emacs 24 or later. (emacsql db [:create-table people [name (id integer :unique) (salary float)]]) ;; Insert some data: -(emacsql-insert db 'people ["Jeff" 1000 60000.0] - ["Susan" 1001 64000.0]) +(emacsql db [:insert :into people + :values (["Jeff" 1000 60000.0] ["Susan" 1001 64000.0])]) ;; Query the database for results: -(emacsql db [:select [name id] :from people :where (> salary 62000)]) +(emacsql db [:select [name id] + :from people + :where (> salary 62000)]) ;; => (("Susan" 1001)) ;; Queries can be templates, using $1, $2, etc.: -(emacsql db [:select [name id] :from people :where (> salary $1)] 50000) +(emacsql db [:select [name id] + :from people + :where (> salary $1)] + 50000) ;; => (("Jeff" 1000) ("Susan" 1001)) ``` diff --git a/emacsql.el b/emacsql.el index 5dd6ba7fed..c0fa338734 100644 --- a/emacsql.el +++ b/emacsql.el @@ -28,16 +28,16 @@ ;; Table identifiers can be any lisp object: string, symbol, etc. I ;; suggest using a symbol. Use `emacsql-create' to create a table. -;; (emacsql-create db 'employees [name id salary]) +;; (emacsql db [:create-table people [name id salary]]) ;; Column constraints can optionally be provided. -;; (emacsql-create db 'employees [name (id integer) (salary real)]) +;; (emacsql db [:create-table people [name (id integer :unique) salary]]) ;; Insert values into a table with `emacsql-insert'. -;; (emacsql-insert db 'employees ["Jeff" 1000 60000.0] -;; ["Susan" 1001 64000.0]) +;; (emacsql db [:insert :into people +;; :values (["Jeff" 1000 60000.0] ["Susan" 1001 64000.0])]) ;; Currently all actions are synchronous and Emacs will block until ;; SQLite has indicated it is finished processing the last command. @@ -48,6 +48,7 @@ ;; ;; => (("Susan" 1001)) ;; Queries can be templates using $1, $2, etc.: + ;; (emacsql db ;; [:select [name id] :from employees :where (> salary $1)] ;; 50000)