diff --git a/go.mod b/go.mod index 474da43..35fa39f 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ replace github.com/mattn/go-sqlite3 v1.14.13 => github.com/multiprocessio/go-sql require ( github.com/chzyer/readline v1.5.0 github.com/google/uuid v1.3.0 - github.com/multiprocessio/datastation/runner v0.0.0-20220515135312-4353b40df35b + github.com/multiprocessio/datastation/runner v0.0.0-20220520232059-1f3a63ad0fc4 github.com/olekukonko/tablewriter v0.0.5 ) @@ -75,7 +75,7 @@ require ( github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/multiprocessio/go-json v0.0.0-20220308002443-61d497dd7b9e // indirect github.com/multiprocessio/go-openoffice v0.0.0-20220110232726-064f5dda1956 // indirect - github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220515132214-0499e13b82b2 // indirect + github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220520203101-c3fc58eca0a1 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/neo4j/neo4j-go-driver/v4 v4.4.2 // indirect github.com/paulmach/orb v0.5.0 // indirect @@ -102,7 +102,7 @@ require ( go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/otel v1.7.0 // indirect go.opentelemetry.io/otel/trace v1.7.0 // indirect - golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect + golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 // indirect golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 // indirect golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32 // indirect diff --git a/go.sum b/go.sum index e34cb76..deebfe6 100644 --- a/go.sum +++ b/go.sum @@ -443,16 +443,16 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/multiprocessio/datastation/runner v0.0.0-20220515135312-4353b40df35b h1:oZUi1VGZGeJa1mfzTRR/r7kFLjg8e6x80tThXYjKYLo= -github.com/multiprocessio/datastation/runner v0.0.0-20220515135312-4353b40df35b/go.mod h1:E7zAYrDf3CfLaSOtuclIcIkzMIyj9Srga8f65LF80Ac= +github.com/multiprocessio/datastation/runner v0.0.0-20220520232059-1f3a63ad0fc4 h1:axANsdFdA1RfQ8oC5TJfDHR8h14R2OwH+8N4okyGl4s= +github.com/multiprocessio/datastation/runner v0.0.0-20220520232059-1f3a63ad0fc4/go.mod h1:qJZSNqeA/IW+pbU8yvjvoIQ92bvcwJkgLmgCsGJP1gE= github.com/multiprocessio/go-json v0.0.0-20220308002443-61d497dd7b9e h1:NlPl7amllnQyVAkZgjBvFEkKxJSba/R8ZpaTodc7SIQ= github.com/multiprocessio/go-json v0.0.0-20220308002443-61d497dd7b9e/go.mod h1:huI4M/MrI5px/SgmXYi0a2byKikSLgDrnMQuXOqKtw4= github.com/multiprocessio/go-openoffice v0.0.0-20220110232726-064f5dda1956 h1:WVofL03Eq+z3LbDOfH5eKzu2U85LFZZngOMBlNaO/H0= github.com/multiprocessio/go-openoffice v0.0.0-20220110232726-064f5dda1956/go.mod h1:JMhCobMOTCgIL4EwBPVrRB60Iq9hknRP9mX/MYiWHAc= github.com/multiprocessio/go-sqlite3 v1.14.14-0.20220513213203-12637a65d5d7 h1:1OnwC0UiVssO2YVo/iU1eDXIha/WBXeK/CgFevo35KY= github.com/multiprocessio/go-sqlite3 v1.14.14-0.20220513213203-12637a65d5d7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220515132214-0499e13b82b2 h1:7M1WgRKA2wqWNrztqrMHd00j4KD9Ph7beaR+S36SvDc= -github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220515132214-0499e13b82b2/go.mod h1:CzeoFLGPKRgVlqqdus5LSlsxYWUktye2PJfg68oRPIM= +github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220520203101-c3fc58eca0a1 h1:xA7VIHNVkiWLZ1xdm/+8IlsbbH2CILlaa3NInmHIrts= +github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220520203101-c3fc58eca0a1/go.mod h1:0PRccbkw6UmCLbpUHVBuq0yyH7IFAMuug1wvd+TpF40= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -602,8 +602,8 @@ golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA= -golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 h1:SLP7Q4Di66FONjDJbCYrCRrh97focO6sLogHO7/g8F0= +golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= diff --git a/scripts/test.py b/scripts/test.py index 95b57b7..010281c 100755 --- a/scripts/test.py +++ b/scripts/test.py @@ -305,7 +305,12 @@ def test(name, to_run, want, fail=False, sort=False, winSkip=False, within_secon # URL functions to_run = """./dsq testdata/basic_logs.csv 'SELECT url_host(request) host, count(1) count FROM {} group by host' """ want = '[{"host":"age.com","count":2}]' -test("URL functions", to_run, want=want) +test("URL functions", to_run, want=want, sort=True) + +# URL functions, split_part +to_run = """./dsq testdata/basic_logs.csv 'SELECT split_part(url_host(request), ".", -1) host, count(1) count FROM {} group by host' """ +want = '[{"host":"com","count":2}]' +test("URL functions", to_run, want=want, sort=True) # END OF TESTS