From 5cb7e62520bda6c9bb183a718a209ab4c0a4d10d Mon Sep 17 00:00:00 2001
From: thijsheijden <hi@thijsheijden.nl>
Date: Mon, 17 May 2021 18:46:06 +0200
Subject: [PATCH] Added aql conversion code from query service
---
convertQuery.go => aql/convertQuery.go | 2 +-
.../convertQueryBenchmark_test.go | 0
convertQuery_test.go => aql/convertQuery_test.go | 0
createConstraints.go => aql/createConstraints.go | 2 +-
{entity => aql/entity}/queryStruct.go | 0
mockConvertQuery.go => aql/mockConvertQuery.go | 0
queryConverter.go => aql/queryConverter.go | 0
go.mod | 2 +-
go.sum | 1 +
9 files changed, 4 insertions(+), 3 deletions(-)
rename convertQuery.go => aql/convertQuery.go (99%)
rename convertQueryBenchmark_test.go => aql/convertQueryBenchmark_test.go (100%)
rename convertQuery_test.go => aql/convertQuery_test.go (100%)
rename createConstraints.go => aql/createConstraints.go (97%)
rename {entity => aql/entity}/queryStruct.go (100%)
rename mockConvertQuery.go => aql/mockConvertQuery.go (100%)
rename queryConverter.go => aql/queryConverter.go (100%)
diff --git a/convertQuery.go b/aql/convertQuery.go
similarity index 99%
rename from convertQuery.go
rename to aql/convertQuery.go
index 4c5420a..8ef1db0 100644
--- a/convertQuery.go
+++ b/aql/convertQuery.go
@@ -5,7 +5,7 @@ import (
"errors"
"fmt"
- "git.science.uu.nl/datastrophe/aql-conversion/entity"
+ "git.science.uu.nl/datastrophe/query-conversion/aql/entity"
)
/*
diff --git a/convertQueryBenchmark_test.go b/aql/convertQueryBenchmark_test.go
similarity index 100%
rename from convertQueryBenchmark_test.go
rename to aql/convertQueryBenchmark_test.go
diff --git a/convertQuery_test.go b/aql/convertQuery_test.go
similarity index 100%
rename from convertQuery_test.go
rename to aql/convertQuery_test.go
diff --git a/createConstraints.go b/aql/createConstraints.go
similarity index 97%
rename from createConstraints.go
rename to aql/createConstraints.go
index abe8035..74511d5 100644
--- a/createConstraints.go
+++ b/aql/createConstraints.go
@@ -3,7 +3,7 @@ package aql
import (
"fmt"
- "git.science.uu.nl/datastrophe/aql-conversion/entity"
+ "git.science.uu.nl/datastrophe/query-conversion/aql/entity"
)
/* createConstraintStatements generates the appropriate amount of constraint lines calling createConstraingBoolExpression
diff --git a/entity/queryStruct.go b/aql/entity/queryStruct.go
similarity index 100%
rename from entity/queryStruct.go
rename to aql/entity/queryStruct.go
diff --git a/mockConvertQuery.go b/aql/mockConvertQuery.go
similarity index 100%
rename from mockConvertQuery.go
rename to aql/mockConvertQuery.go
diff --git a/queryConverter.go b/aql/queryConverter.go
similarity index 100%
rename from queryConverter.go
rename to aql/queryConverter.go
diff --git a/go.mod b/go.mod
index 3a61254..928390f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module git.science.uu.nl/datastrophe/aql-conversion
+module git.science.uu.nl/datastrophe/query-conversion
go 1.16
diff --git a/go.sum b/go.sum
index b380ae4..acb88a4 100644
--- a/go.sum
+++ b/go.sum
@@ -5,6 +5,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--
GitLab