mirror of
https://github.com/jackfoxy/urQL.git
synced 2024-09-11 11:55:33 +03:00
refactor select-column
This commit is contained in:
jackfoxy
parent
fda814cab1
commit
525fb0670e
@ -959,40 +959,23 @@
|
||||
==
|
||||
++ parse-alias-all ~+ (stag %all-columns ;~(sfix parse-alias ;~(plug dot tar)))
|
||||
++ parse-object-all ~+ (stag %all-columns ;~(sfix parse-qualified-object ;~(plug dot tar)))
|
||||
++ select-column ~+ ;~ pose
|
||||
;~(sfix ;~(plug ;~(sfix ;~(pfix whitespace parse-aggregate) whitespace) (cold %as (jester 'as')) ;~(pfix whitespace alias)) whitespace)
|
||||
;~(plug ;~(sfix ;~(pfix whitespace parse-aggregate) whitespace) (cold %as (jester 'as')) ;~(pfix whitespace alias))
|
||||
;~(sfix ;~(plug ;~(sfix parse-aggregate whitespace) (cold %as (jester 'as')) ;~(pfix whitespace alias)) whitespace)
|
||||
++ parse-selection ;~ pose
|
||||
;~(plug ;~(sfix parse-aggregate whitespace) (cold %as (jester 'as')) ;~(pfix whitespace alias))
|
||||
::
|
||||
;~(sfix ;~(pfix whitespace parse-aggregate) whitespace)
|
||||
;~(pfix whitespace parse-aggregate)
|
||||
;~(sfix parse-aggregate whitespace)
|
||||
parse-aggregate
|
||||
::
|
||||
;~(sfix ;~(pfix whitespace parse-alias-all) whitespace)
|
||||
;~(pfix whitespace parse-alias-all)
|
||||
;~(sfix parse-alias-all whitespace)
|
||||
parse-alias-all
|
||||
::
|
||||
;~(sfix ;~(pfix whitespace parse-object-all) whitespace)
|
||||
;~(pfix whitespace parse-object-all)
|
||||
;~(sfix parse-object-all whitespace)
|
||||
parse-object-all
|
||||
::
|
||||
;~(sfix ;~(plug get-datum (cold %as (jester 'as')) ;~(pfix whitespace alias)) whitespace)
|
||||
;~(plug get-datum (cold %as (jester 'as')) ;~(pfix whitespace alias))
|
||||
::
|
||||
;~(plug ;~(sfix ;~(pose parse-qualified-column parse-value-literal) whitespace) (cold %as (jester 'as')) ;~(pfix whitespace alias))
|
||||
get-datum
|
||||
::
|
||||
(cold %all ;~(plug whitespace tar whitespace))
|
||||
(cold %all ;~(plug whitespace tar))
|
||||
(cold %all ;~(plug tar whitespace))
|
||||
(cold %all tar)
|
||||
==
|
||||
++ select-column ~+ ;~ pose
|
||||
;~(pfix whitespace ;~(sfix parse-selection whitespace))
|
||||
;~(pfix whitespace parse-selection)
|
||||
;~(sfix parse-selection whitespace)
|
||||
parse-selection
|
||||
==
|
||||
++ select-columns ~+ (full (more com select-column))
|
||||
++ select-top-bottom-distinct ~+ ;~ plug
|
||||
(cold %select ;~(plug whitespace (jester 'select')))
|
||||
(cold %top ;~(plug whitespace (jester 'top')))
|
||||
;~(pfix whitespace dem)
|
||||
(cold %bottom ;~(plug whitespace (jester 'bottom')))
|
||||
@ -1001,57 +984,53 @@
|
||||
select-columns
|
||||
==
|
||||
++ select-top-bottom ~+ ;~ plug
|
||||
(cold %select ;~(plug whitespace (jester 'select')))
|
||||
(cold %top ;~(plug whitespace (jester 'top')))
|
||||
;~(pfix whitespace dem)
|
||||
(cold %bottom ;~(plug whitespace (jester 'bottom')))
|
||||
;~(pfix whitespace dem)
|
||||
;~(less ;~(plug whitespace (jester 'distinct')) select-columns)
|
||||
select-columns
|
||||
==
|
||||
++ select-top-distinct ~+ ;~ plug
|
||||
(cold %select ;~(plug whitespace (jester 'select')))
|
||||
(cold %top ;~(plug whitespace (jester 'top')))
|
||||
;~(pfix whitespace dem)
|
||||
(cold %distinct ;~(plug whitespace (jester 'distinct')))
|
||||
select-columns
|
||||
==
|
||||
++ select-top ~+ ;~ plug
|
||||
(cold %select ;~(plug whitespace (jester 'select')))
|
||||
(cold %top ;~(plug whitespace (jester 'top')))
|
||||
;~(pfix whitespace dem)
|
||||
;~(less ;~(plug whitespace (jester 'distinct')) select-columns)
|
||||
select-columns
|
||||
==
|
||||
++ select-bottom-distinct ~+ ;~ plug
|
||||
(cold %select ;~(plug whitespace (jester 'select')))
|
||||
(cold %bottom ;~(plug whitespace (jester 'bottom')))
|
||||
;~(pfix whitespace dem)
|
||||
(cold %distinct ;~(plug whitespace (jester 'distinct')))
|
||||
select-columns
|
||||
==
|
||||
++ select-bottom ~+ ;~ plug
|
||||
(cold %select ;~(plug whitespace (jester 'select')))
|
||||
(cold %bottom ;~(plug whitespace (jester 'bottom')))
|
||||
;~(pfix whitespace dem)
|
||||
;~(less ;~(plug whitespace (jester 'distinct')) select-columns)
|
||||
select-columns
|
||||
==
|
||||
++ select-distinct ~+ ;~ plug
|
||||
(cold %select ;~(plug whitespace (jester 'select')))
|
||||
(cold %distinct ;~(plug whitespace (jester 'distinct')))
|
||||
select-columns
|
||||
==
|
||||
++ simple-select ~+ ;~ plug
|
||||
++ parse-select ~+ ;~ plug
|
||||
(cold %select ;~(plug whitespace (jester 'select')))
|
||||
;~(less ;~(plug whitespace (jester 'distinct')) select-columns)
|
||||
==
|
||||
++ parse-select ~+ ;~ pose
|
||||
;~(less select-stop select-top-bottom-distinct)
|
||||
;~(less select-stop select-top-bottom)
|
||||
;~(less select-stop select-top-distinct)
|
||||
;~(less select-stop select-top)
|
||||
;~(less select-stop select-bottom-distinct)
|
||||
;~(less select-stop select-bottom)
|
||||
;~(less select-stop select-distinct)
|
||||
;~(less select-stop simple-select)
|
||||
;~ less
|
||||
select-stop
|
||||
;~ pose
|
||||
select-top-bottom-distinct
|
||||
select-top-bottom
|
||||
select-top-distinct
|
||||
select-top
|
||||
select-bottom-distinct
|
||||
select-bottom
|
||||
select-distinct
|
||||
select-columns
|
||||
==
|
||||
==
|
||||
==
|
||||
::
|
||||
:: parse urQL command
|
||||
|
||||
@ -1331,116 +1331,92 @@
|
||||
!> [%select %distinct [%all ~]]
|
||||
!> (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, bottom, distinct, no column selection, trailing whitespace
|
||||
++ test-fail-select-16
|
||||
=/ select "select top 10 bottom 10 distinct "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, bottom, distinct, no bottom parameter, trailing whitespace
|
||||
++ test-fail-select-17
|
||||
++ test-fail-select-16
|
||||
=/ select "select top 10 bottom distinct * "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, bottom, distinct, no bottom parameter
|
||||
++ test-fail-select-18
|
||||
++ test-fail-select-17
|
||||
=/ select "select top 10 bottom distinct *"
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, bottom, distinct, no top parameter, trailing whitespace
|
||||
++ test-fail-select-19
|
||||
++ test-fail-select-18
|
||||
=/ select "select top bottom 10 distinct * "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, bottom, distinct, no top parameter
|
||||
++ test-fail-select-20
|
||||
++ test-fail-select-19
|
||||
=/ select "select top bottom 10 distinct *"
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, bottom, no column selection, trailing whitespace
|
||||
++ test-fail-select-21
|
||||
++ test-fail-select-20
|
||||
=/ select "select top 10 bottom 10 "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, bottom, no bottom parameter, trailing whitespace
|
||||
++ test-fail-select-22
|
||||
++ test-fail-select-21
|
||||
=/ select "select top 10 bottom * "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, bottom, no bottom parameter
|
||||
++ test-fail-select-23
|
||||
++ test-fail-select-22
|
||||
=/ select "select top 10 bottom *"
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, no column selection, trailing whitespace
|
||||
++ test-fail-select-24
|
||||
++ test-fail-select-23
|
||||
=/ select "select top 10 "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, distinct, no column selection, trailing whitespace
|
||||
++ test-fail-select-25
|
||||
=/ select "select top 10 distinct "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, distinct, no top parameter, trailing whitespace
|
||||
++ test-fail-select-26
|
||||
++ test-fail-select-24
|
||||
=/ select "select top distinct * "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail top, distinct, no top parameter
|
||||
++ test-fail-select-27
|
||||
++ test-fail-select-25
|
||||
=/ select "select top distinct *"
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail no column selection, trailing whitespace
|
||||
++ test-fail-select-28
|
||||
++ test-fail-select-26
|
||||
=/ select "select "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail bottom, distinct, no column selection, trailing whitespace
|
||||
++ test-fail-select-29
|
||||
=/ select "select bottom 10 distinct "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail bottom, distinct, no bottom parameter, trailing whitespace
|
||||
++ test-fail-select-30
|
||||
++ test-fail-select-27
|
||||
=/ select "select bottom distinct * "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail bottom, distinct, no bottom parameter
|
||||
++ test-fail-select-31
|
||||
++ test-fail-select-28
|
||||
=/ select "select bottom distinct *"
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail bottom, no column selection, trailing whitespace
|
||||
++ test-fail-select-32
|
||||
++ test-fail-select-29
|
||||
=/ select "select bottom 10 "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: fail distinct, no column selection, trailing whitespace
|
||||
++ test-fail-select-33
|
||||
=/ select "select distinct "
|
||||
%- expect-fail
|
||||
|. (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: select top, bottom, distinct, simple columns
|
||||
++ test-select-34
|
||||
++ test-select-30
|
||||
=/ select "select top 10 bottom 10 distinct ".
|
||||
" x1, db.ns.table.col1, table-alias.name, db..table.col2, T1.foo, 1, ~zod, 'cord'"
|
||||
%+ expect-eq
|
||||
@ -1448,49 +1424,49 @@
|
||||
!> (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: select top, bottom, distinct, simple columns, trailing space, no internal space
|
||||
++ test-select-35
|
||||
++ test-select-31
|
||||
=/ select "select top 10 bottom 10 distinct x1,db.ns.table.col1,table-alias.name,db..table.col2,T1.foo,1,~zod,'cord' "
|
||||
%+ expect-eq
|
||||
!> [%select %top 10 %bottom 10 %distinct [simple-columns]]
|
||||
!> (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: aliased format 1 columns
|
||||
++ test-select-36
|
||||
++ test-select-32
|
||||
=/ select "select x1 as foo , db.ns.table.col1 as foo2 , table-alias.name as bar , db..table.col2 as bar2 , 1 as foobar , ~zod as F1 , 'cord' as BAR3 "
|
||||
%+ expect-eq
|
||||
!> [%select [aliased-columns-1]]
|
||||
!> (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: aliased format 1 columns, no whitespace
|
||||
++ test-select-37
|
||||
++ test-select-33
|
||||
=/ select "select x1 as foo,db.ns.table.col1 as foo2,table-alias.name as bar,db..table.col2 as bar2,1 as foobar,~zod as F1,'cord' as BAR3"
|
||||
%+ expect-eq
|
||||
!> [%select [aliased-columns-1]]
|
||||
!> (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: mixed all, object all, object alias all, column, aliased column
|
||||
++ test-select-38
|
||||
++ test-select-34
|
||||
=/ select "select db..t1.* , foo as foobar , bar , * , T2.* "
|
||||
%+ expect-eq
|
||||
!> [%select [mixed-all]]
|
||||
!> (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: mixed all, object all, object alias all, column, aliased column, no whitespace
|
||||
++ test-select-39
|
||||
++ test-select-35
|
||||
=/ select "select db..t1.*,foo as foobar,bar,*,T2.*"
|
||||
%+ expect-eq
|
||||
!> [%select [mixed-all]]
|
||||
!> (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: mixed aggregates
|
||||
++ test-select-40
|
||||
++ test-select-36
|
||||
=/ select "select foo , COUNT(foo) as CountFoo, cOUNT( bar) ,sum(bar ) , sum( foobar ) as foobar "
|
||||
%+ expect-eq
|
||||
!> [%select [aggregates]]
|
||||
!> (wonk (parse-select:parse [[1 1] select]))
|
||||
::
|
||||
:: mixed aggregates, no whitespace
|
||||
++ test-select-41
|
||||
++ test-select-37
|
||||
=/ select "select foo,COUNT(foo) as CountFoo,cOUNT( bar),sum(bar ),sum( foobar ) as foobar"
|
||||
%+ expect-eq
|
||||
!> [%select [aggregates]]
|
||||
@ -1552,4 +1528,33 @@
|
||||
:: =/ select "select distinct"
|
||||
:: %- expect-fail
|
||||
:: |. (wonk (parse-select:parse [[1 1] select]))
|
||||
|
||||
::
|
||||
:: fail distinct, no column selection, trailing whitespace
|
||||
::++ test-fail-select-
|
||||
:: =/ select "select distinct "
|
||||
:: %- expect-fail
|
||||
:: |. (wonk (parse-select:parse [[1 1] select]))
|
||||
|
||||
::
|
||||
:: fail top, distinct, no column selection, trailing whitespace
|
||||
::++ test-fail-select-
|
||||
:: =/ select "select top 10 distinct "
|
||||
:: %- expect-fail
|
||||
:: |. (wonk (parse-select:parse [[1 1] select]))
|
||||
|
||||
::
|
||||
:: fail top, bottom, distinct, no column selection, trailing whitespace
|
||||
::++ test-fail-select-
|
||||
:: =/ select "select top 10 bottom 10 distinct "
|
||||
:: %- expect-fail
|
||||
:: |. (wonk (parse-select:parse [[1 1] select]))
|
||||
|
||||
::
|
||||
:: fail bottom, distinct, no column selection, trailing whitespace
|
||||
::++ test-fail-select-
|
||||
:: =/ select "select bottom 10 distinct "
|
||||
:: %- expect-fail
|
||||
:: |. (wonk (parse-select:parse [[1 1] select]))
|
||||
|
||||
--
|
||||
Loading…
Reference in New Issue
Block a user