mirror of
https://github.com/pikami/cosmium.git
synced 2026-06-14 16:27:17 +01:00
Compare commits
4 Commits
30195fae96
...
0.1.23
| Author | SHA1 | Date | |
|---|---|---|---|
| 11851297f5 | |||
| 560ea5296d | |||
| e20a6ca7cd | |||
| 7e0c10479b |
@@ -5,6 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/pikami/cosmium/internal/constants"
|
||||||
"github.com/pikami/cosmium/internal/datastore"
|
"github.com/pikami/cosmium/internal/datastore"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -24,7 +25,7 @@ func (h *Handlers) GetAllCollections(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) GetCollection(c *gin.Context) {
|
func (h *Handlers) GetCollection(c *gin.Context) {
|
||||||
@@ -38,11 +39,11 @@ func (h *Handlers) GetCollection(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) DeleteCollection(c *gin.Context) {
|
func (h *Handlers) DeleteCollection(c *gin.Context) {
|
||||||
@@ -56,11 +57,11 @@ func (h *Handlers) DeleteCollection(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) CreateCollection(c *gin.Context) {
|
func (h *Handlers) CreateCollection(c *gin.Context) {
|
||||||
@@ -73,13 +74,13 @@ func (h *Handlers) CreateCollection(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if newCollection.ID == "" {
|
if newCollection.ID == "" {
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"message": "BadRequest"})
|
c.JSON(http.StatusBadRequest, constants.BadRequestResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
createdCollection, status := h.dataStore.CreateCollection(databaseId, newCollection)
|
createdCollection, status := h.dataStore.CreateCollection(databaseId, newCollection)
|
||||||
if status == datastore.Conflict {
|
if status == datastore.Conflict {
|
||||||
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
|
c.IndentedJSON(http.StatusConflict, constants.ConflictResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,5 +89,5 @@ func (h *Handlers) CreateCollection(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/pikami/cosmium/internal/constants"
|
||||||
"github.com/pikami/cosmium/internal/datastore"
|
"github.com/pikami/cosmium/internal/datastore"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -20,7 +21,7 @@ func (h *Handlers) GetAllDatabases(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) GetDatabase(c *gin.Context) {
|
func (h *Handlers) GetDatabase(c *gin.Context) {
|
||||||
@@ -33,11 +34,11 @@ func (h *Handlers) GetDatabase(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) DeleteDatabase(c *gin.Context) {
|
func (h *Handlers) DeleteDatabase(c *gin.Context) {
|
||||||
@@ -50,11 +51,11 @@ func (h *Handlers) DeleteDatabase(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) CreateDatabase(c *gin.Context) {
|
func (h *Handlers) CreateDatabase(c *gin.Context) {
|
||||||
@@ -66,13 +67,13 @@ func (h *Handlers) CreateDatabase(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if newDatabase.ID == "" {
|
if newDatabase.ID == "" {
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"message": "BadRequest"})
|
c.JSON(http.StatusBadRequest, constants.BadRequestResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
createdDatabase, status := h.dataStore.CreateDatabase(newDatabase)
|
createdDatabase, status := h.dataStore.CreateDatabase(newDatabase)
|
||||||
if status == datastore.Conflict {
|
if status == datastore.Conflict {
|
||||||
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
|
c.IndentedJSON(http.StatusConflict, constants.ConflictResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,5 +82,5 @@ func (h *Handlers) CreateDatabase(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|||||||
+15
-15
@@ -35,7 +35,7 @@ func (h *Handlers) GetAllDocuments(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) GetDocument(c *gin.Context) {
|
func (h *Handlers) GetDocument(c *gin.Context) {
|
||||||
@@ -50,11 +50,11 @@ func (h *Handlers) GetDocument(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) DeleteDocument(c *gin.Context) {
|
func (h *Handlers) DeleteDocument(c *gin.Context) {
|
||||||
@@ -69,11 +69,11 @@ func (h *Handlers) DeleteDocument(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Maybe move "replace" logic to data store
|
// TODO: Maybe move "replace" logic to data store
|
||||||
@@ -90,13 +90,13 @@ func (h *Handlers) ReplaceDocument(c *gin.Context) {
|
|||||||
|
|
||||||
status := h.dataStore.DeleteDocument(databaseId, collectionId, documentId)
|
status := h.dataStore.DeleteDocument(databaseId, collectionId, documentId)
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
createdDocument, status := h.dataStore.CreateDocument(databaseId, collectionId, requestBody)
|
createdDocument, status := h.dataStore.CreateDocument(databaseId, collectionId, requestBody)
|
||||||
if status == datastore.Conflict {
|
if status == datastore.Conflict {
|
||||||
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
|
c.IndentedJSON(http.StatusConflict, constants.ConflictResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,7 +105,7 @@ func (h *Handlers) ReplaceDocument(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) PatchDocument(c *gin.Context) {
|
func (h *Handlers) PatchDocument(c *gin.Context) {
|
||||||
@@ -115,7 +115,7 @@ func (h *Handlers) PatchDocument(c *gin.Context) {
|
|||||||
|
|
||||||
document, status := h.dataStore.GetDocument(databaseId, collectionId, documentId)
|
document, status := h.dataStore.GetDocument(databaseId, collectionId, documentId)
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -166,13 +166,13 @@ func (h *Handlers) PatchDocument(c *gin.Context) {
|
|||||||
|
|
||||||
status = h.dataStore.DeleteDocument(databaseId, collectionId, documentId)
|
status = h.dataStore.DeleteDocument(databaseId, collectionId, documentId)
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
createdDocument, status := h.dataStore.CreateDocument(databaseId, collectionId, modifiedDocument)
|
createdDocument, status := h.dataStore.CreateDocument(databaseId, collectionId, modifiedDocument)
|
||||||
if status == datastore.Conflict {
|
if status == datastore.Conflict {
|
||||||
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
|
c.IndentedJSON(http.StatusConflict, constants.ConflictResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,7 +181,7 @@ func (h *Handlers) PatchDocument(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) DocumentsPost(c *gin.Context) {
|
func (h *Handlers) DocumentsPost(c *gin.Context) {
|
||||||
@@ -208,7 +208,7 @@ func (h *Handlers) DocumentsPost(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if requestBody["id"] == "" {
|
if requestBody["id"] == "" {
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"message": "BadRequest"})
|
c.JSON(http.StatusBadRequest, constants.BadRequestResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,7 +219,7 @@ func (h *Handlers) DocumentsPost(c *gin.Context) {
|
|||||||
|
|
||||||
createdDocument, status := h.dataStore.CreateDocument(databaseId, collectionId, requestBody)
|
createdDocument, status := h.dataStore.CreateDocument(databaseId, collectionId, requestBody)
|
||||||
if status == datastore.Conflict {
|
if status == datastore.Conflict {
|
||||||
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
|
c.IndentedJSON(http.StatusConflict, constants.ConflictResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -228,7 +228,7 @@ func (h *Handlers) DocumentsPost(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func parametersToMap(pairs []interface{}) map[string]interface{} {
|
func parametersToMap(pairs []interface{}) map[string]interface{} {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/pikami/cosmium/internal/constants"
|
||||||
"github.com/pikami/cosmium/internal/datastore"
|
"github.com/pikami/cosmium/internal/datastore"
|
||||||
"github.com/pikami/cosmium/internal/resourceid"
|
"github.com/pikami/cosmium/internal/resourceid"
|
||||||
)
|
)
|
||||||
@@ -42,9 +43,9 @@ func (h *Handlers) GetPartitionKeyRanges(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/pikami/cosmium/internal/constants"
|
||||||
"github.com/pikami/cosmium/internal/datastore"
|
"github.com/pikami/cosmium/internal/datastore"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -20,7 +21,7 @@ func (h *Handlers) GetAllStoredProcedures(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) GetStoredProcedure(c *gin.Context) {
|
func (h *Handlers) GetStoredProcedure(c *gin.Context) {
|
||||||
@@ -36,11 +37,11 @@ func (h *Handlers) GetStoredProcedure(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) DeleteStoredProcedure(c *gin.Context) {
|
func (h *Handlers) DeleteStoredProcedure(c *gin.Context) {
|
||||||
@@ -55,11 +56,11 @@ func (h *Handlers) DeleteStoredProcedure(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) ReplaceStoredProcedure(c *gin.Context) {
|
func (h *Handlers) ReplaceStoredProcedure(c *gin.Context) {
|
||||||
@@ -69,19 +70,19 @@ func (h *Handlers) ReplaceStoredProcedure(c *gin.Context) {
|
|||||||
|
|
||||||
var sp datastore.StoredProcedure
|
var sp datastore.StoredProcedure
|
||||||
if err := c.BindJSON(&sp); err != nil {
|
if err := c.BindJSON(&sp); err != nil {
|
||||||
c.IndentedJSON(http.StatusBadRequest, gin.H{"message": "Invalid body"})
|
c.IndentedJSON(http.StatusBadRequest, constants.BadRequestResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
status := h.dataStore.DeleteStoredProcedure(databaseId, collectionId, spId)
|
status := h.dataStore.DeleteStoredProcedure(databaseId, collectionId, spId)
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
createdSP, status := h.dataStore.CreateStoredProcedure(databaseId, collectionId, sp)
|
createdSP, status := h.dataStore.CreateStoredProcedure(databaseId, collectionId, sp)
|
||||||
if status == datastore.Conflict {
|
if status == datastore.Conflict {
|
||||||
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
|
c.IndentedJSON(http.StatusConflict, constants.ConflictResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,7 +91,7 @@ func (h *Handlers) ReplaceStoredProcedure(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) CreateStoredProcedure(c *gin.Context) {
|
func (h *Handlers) CreateStoredProcedure(c *gin.Context) {
|
||||||
@@ -99,13 +100,13 @@ func (h *Handlers) CreateStoredProcedure(c *gin.Context) {
|
|||||||
|
|
||||||
var sp datastore.StoredProcedure
|
var sp datastore.StoredProcedure
|
||||||
if err := c.BindJSON(&sp); err != nil {
|
if err := c.BindJSON(&sp); err != nil {
|
||||||
c.IndentedJSON(http.StatusBadRequest, gin.H{"message": "Invalid body"})
|
c.IndentedJSON(http.StatusBadRequest, constants.BadRequestResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
createdSP, status := h.dataStore.CreateStoredProcedure(databaseId, collectionId, sp)
|
createdSP, status := h.dataStore.CreateStoredProcedure(databaseId, collectionId, sp)
|
||||||
if status == datastore.Conflict {
|
if status == datastore.Conflict {
|
||||||
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
|
c.IndentedJSON(http.StatusConflict, constants.ConflictResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,5 +115,5 @@ func (h *Handlers) CreateStoredProcedure(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-12
@@ -5,6 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/pikami/cosmium/internal/constants"
|
||||||
"github.com/pikami/cosmium/internal/datastore"
|
"github.com/pikami/cosmium/internal/datastore"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -20,7 +21,7 @@ func (h *Handlers) GetAllTriggers(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) GetTrigger(c *gin.Context) {
|
func (h *Handlers) GetTrigger(c *gin.Context) {
|
||||||
@@ -36,11 +37,11 @@ func (h *Handlers) GetTrigger(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) DeleteTrigger(c *gin.Context) {
|
func (h *Handlers) DeleteTrigger(c *gin.Context) {
|
||||||
@@ -55,11 +56,11 @@ func (h *Handlers) DeleteTrigger(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) ReplaceTrigger(c *gin.Context) {
|
func (h *Handlers) ReplaceTrigger(c *gin.Context) {
|
||||||
@@ -69,19 +70,19 @@ func (h *Handlers) ReplaceTrigger(c *gin.Context) {
|
|||||||
|
|
||||||
var trigger datastore.Trigger
|
var trigger datastore.Trigger
|
||||||
if err := c.BindJSON(&trigger); err != nil {
|
if err := c.BindJSON(&trigger); err != nil {
|
||||||
c.IndentedJSON(http.StatusBadRequest, gin.H{"message": "Invalid body"})
|
c.IndentedJSON(http.StatusBadRequest, constants.BadRequestResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
status := h.dataStore.DeleteTrigger(databaseId, collectionId, triggerId)
|
status := h.dataStore.DeleteTrigger(databaseId, collectionId, triggerId)
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
createdTrigger, status := h.dataStore.CreateTrigger(databaseId, collectionId, trigger)
|
createdTrigger, status := h.dataStore.CreateTrigger(databaseId, collectionId, trigger)
|
||||||
if status == datastore.Conflict {
|
if status == datastore.Conflict {
|
||||||
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
|
c.IndentedJSON(http.StatusConflict, constants.ConflictResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,7 +91,7 @@ func (h *Handlers) ReplaceTrigger(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) CreateTrigger(c *gin.Context) {
|
func (h *Handlers) CreateTrigger(c *gin.Context) {
|
||||||
@@ -99,13 +100,13 @@ func (h *Handlers) CreateTrigger(c *gin.Context) {
|
|||||||
|
|
||||||
var trigger datastore.Trigger
|
var trigger datastore.Trigger
|
||||||
if err := c.BindJSON(&trigger); err != nil {
|
if err := c.BindJSON(&trigger); err != nil {
|
||||||
c.IndentedJSON(http.StatusBadRequest, gin.H{"message": "Invalid body"})
|
c.IndentedJSON(http.StatusBadRequest, constants.BadRequestResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
createdTrigger, status := h.dataStore.CreateTrigger(databaseId, collectionId, trigger)
|
createdTrigger, status := h.dataStore.CreateTrigger(databaseId, collectionId, trigger)
|
||||||
if status == datastore.Conflict {
|
if status == datastore.Conflict {
|
||||||
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
|
c.IndentedJSON(http.StatusConflict, constants.ConflictResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,5 +115,5 @@ func (h *Handlers) CreateTrigger(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/pikami/cosmium/internal/constants"
|
||||||
"github.com/pikami/cosmium/internal/datastore"
|
"github.com/pikami/cosmium/internal/datastore"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -20,7 +21,7 @@ func (h *Handlers) GetAllUserDefinedFunctions(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) GetUserDefinedFunction(c *gin.Context) {
|
func (h *Handlers) GetUserDefinedFunction(c *gin.Context) {
|
||||||
@@ -36,11 +37,11 @@ func (h *Handlers) GetUserDefinedFunction(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) DeleteUserDefinedFunction(c *gin.Context) {
|
func (h *Handlers) DeleteUserDefinedFunction(c *gin.Context) {
|
||||||
@@ -55,11 +56,11 @@ func (h *Handlers) DeleteUserDefinedFunction(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) ReplaceUserDefinedFunction(c *gin.Context) {
|
func (h *Handlers) ReplaceUserDefinedFunction(c *gin.Context) {
|
||||||
@@ -69,19 +70,19 @@ func (h *Handlers) ReplaceUserDefinedFunction(c *gin.Context) {
|
|||||||
|
|
||||||
var udf datastore.UserDefinedFunction
|
var udf datastore.UserDefinedFunction
|
||||||
if err := c.BindJSON(&udf); err != nil {
|
if err := c.BindJSON(&udf); err != nil {
|
||||||
c.IndentedJSON(http.StatusBadRequest, gin.H{"message": "Invalid body"})
|
c.IndentedJSON(http.StatusBadRequest, constants.BadRequestResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
status := h.dataStore.DeleteUserDefinedFunction(databaseId, collectionId, udfId)
|
status := h.dataStore.DeleteUserDefinedFunction(databaseId, collectionId, udfId)
|
||||||
if status == datastore.StatusNotFound {
|
if status == datastore.StatusNotFound {
|
||||||
c.IndentedJSON(http.StatusNotFound, gin.H{"message": "NotFound"})
|
c.IndentedJSON(http.StatusNotFound, constants.NotFoundResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
createdUdf, status := h.dataStore.CreateUserDefinedFunction(databaseId, collectionId, udf)
|
createdUdf, status := h.dataStore.CreateUserDefinedFunction(databaseId, collectionId, udf)
|
||||||
if status == datastore.Conflict {
|
if status == datastore.Conflict {
|
||||||
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
|
c.IndentedJSON(http.StatusConflict, constants.ConflictResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,7 +91,7 @@ func (h *Handlers) ReplaceUserDefinedFunction(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) CreateUserDefinedFunction(c *gin.Context) {
|
func (h *Handlers) CreateUserDefinedFunction(c *gin.Context) {
|
||||||
@@ -99,13 +100,13 @@ func (h *Handlers) CreateUserDefinedFunction(c *gin.Context) {
|
|||||||
|
|
||||||
var udf datastore.UserDefinedFunction
|
var udf datastore.UserDefinedFunction
|
||||||
if err := c.BindJSON(&udf); err != nil {
|
if err := c.BindJSON(&udf); err != nil {
|
||||||
c.IndentedJSON(http.StatusBadRequest, gin.H{"message": "Invalid body"})
|
c.IndentedJSON(http.StatusBadRequest, constants.BadRequestResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
createdUdf, status := h.dataStore.CreateUserDefinedFunction(databaseId, collectionId, udf)
|
createdUdf, status := h.dataStore.CreateUserDefinedFunction(databaseId, collectionId, udf)
|
||||||
if status == datastore.Conflict {
|
if status == datastore.Conflict {
|
||||||
c.IndentedJSON(http.StatusConflict, gin.H{"message": "Conflict"})
|
c.IndentedJSON(http.StatusConflict, constants.ConflictResponse)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,5 +115,5 @@ func (h *Handlers) CreateUserDefinedFunction(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": "Unknown error"})
|
c.IndentedJSON(http.StatusInternalServerError, constants.UnknownErrorResponse)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ func Test_Authentication(t *testing.T) {
|
|||||||
t.Run("Should get 200 when correct account key is used", func(t *testing.T) {
|
t.Run("Should get 200 when correct account key is used", func(t *testing.T) {
|
||||||
ts.DataStore.DeleteDatabase(testDatabaseName)
|
ts.DataStore.DeleteDatabase(testDatabaseName)
|
||||||
client, err := azcosmos.NewClientFromConnectionString(
|
client, err := azcosmos.NewClientFromConnectionString(
|
||||||
fmt.Sprintf("AccountEndpoint=%s;AccountKey=%s", ts.URL, config.DefaultAccountKey),
|
formatConnectionString(ts.URL, config.DefaultAccountKey),
|
||||||
&azcosmos.ClientOptions{},
|
&azcosmos.ClientOptions{},
|
||||||
)
|
)
|
||||||
assert.Nil(t, err)
|
assert.Nil(t, err)
|
||||||
@@ -35,7 +35,7 @@ func Test_Authentication(t *testing.T) {
|
|||||||
t.Run("Should get 401 when wrong account key is used", func(t *testing.T) {
|
t.Run("Should get 401 when wrong account key is used", func(t *testing.T) {
|
||||||
ts.DataStore.DeleteDatabase(testDatabaseName)
|
ts.DataStore.DeleteDatabase(testDatabaseName)
|
||||||
client, err := azcosmos.NewClientFromConnectionString(
|
client, err := azcosmos.NewClientFromConnectionString(
|
||||||
fmt.Sprintf("AccountEndpoint=%s;AccountKey=%s", ts.URL, "AAAA"),
|
formatConnectionString(ts.URL, "AAAA"),
|
||||||
&azcosmos.ClientOptions{},
|
&azcosmos.ClientOptions{},
|
||||||
)
|
)
|
||||||
assert.Nil(t, err)
|
assert.Nil(t, err)
|
||||||
@@ -72,7 +72,7 @@ func Test_Authentication_Disabled(t *testing.T) {
|
|||||||
t.Run("Should get 200 when wrong account key is used, but authentication is dissabled", func(t *testing.T) {
|
t.Run("Should get 200 when wrong account key is used, but authentication is dissabled", func(t *testing.T) {
|
||||||
ts.DataStore.DeleteDatabase(testDatabaseName)
|
ts.DataStore.DeleteDatabase(testDatabaseName)
|
||||||
client, err := azcosmos.NewClientFromConnectionString(
|
client, err := azcosmos.NewClientFromConnectionString(
|
||||||
fmt.Sprintf("AccountEndpoint=%s;AccountKey=%s", ts.URL, "AAAA"),
|
formatConnectionString(ts.URL, "AAAA"),
|
||||||
&azcosmos.ClientOptions{},
|
&azcosmos.ClientOptions{},
|
||||||
)
|
)
|
||||||
assert.Nil(t, err)
|
assert.Nil(t, err)
|
||||||
@@ -85,3 +85,7 @@ func Test_Authentication_Disabled(t *testing.T) {
|
|||||||
assert.Equal(t, createResponse.DatabaseProperties.ID, testDatabaseName)
|
assert.Equal(t, createResponse.DatabaseProperties.ID, testDatabaseName)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func formatConnectionString(endpoint, key string) string {
|
||||||
|
return fmt.Sprintf("AccountEndpoint=%s;AccountKey=%s", endpoint, key)
|
||||||
|
}
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ Cosmium strives to support the core features of Cosmos DB, including:
|
|||||||
|
|
||||||
| Function | Implemented |
|
| Function | Implemented |
|
||||||
| -------- | ----------- |
|
| -------- | ----------- |
|
||||||
| IIF | No |
|
| IIF | Yes |
|
||||||
|
|
||||||
### Date and time Functions
|
### Date and time Functions
|
||||||
|
|
||||||
|
|||||||
@@ -30,3 +30,8 @@ var QueryPlanResponse = gin.H{
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var UnknownErrorResponse = gin.H{"message": "Unknown error"}
|
||||||
|
var NotFoundResponse = gin.H{"message": "NotFound"}
|
||||||
|
var ConflictResponse = gin.H{"message": "Conflict"}
|
||||||
|
var BadRequestResponse = gin.H{"message": "BadRequest"}
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ const (
|
|||||||
SelectItemTypeConstant
|
SelectItemTypeConstant
|
||||||
SelectItemTypeFunctionCall
|
SelectItemTypeFunctionCall
|
||||||
SelectItemTypeSubQuery
|
SelectItemTypeSubQuery
|
||||||
|
SelectItemTypeExpression
|
||||||
)
|
)
|
||||||
|
|
||||||
type SelectItem struct {
|
type SelectItem struct {
|
||||||
@@ -134,6 +135,8 @@ const (
|
|||||||
FunctionCallSetIntersect FunctionCallType = "SetIntersect"
|
FunctionCallSetIntersect FunctionCallType = "SetIntersect"
|
||||||
FunctionCallSetUnion FunctionCallType = "SetUnion"
|
FunctionCallSetUnion FunctionCallType = "SetUnion"
|
||||||
|
|
||||||
|
FunctionCallIif FunctionCallType = "Iif"
|
||||||
|
|
||||||
FunctionCallMathAbs FunctionCallType = "MathAbs"
|
FunctionCallMathAbs FunctionCallType = "MathAbs"
|
||||||
FunctionCallMathAcos FunctionCallType = "MathAcos"
|
FunctionCallMathAcos FunctionCallType = "MathAcos"
|
||||||
FunctionCallMathAsin FunctionCallType = "MathAsin"
|
FunctionCallMathAsin FunctionCallType = "MathAsin"
|
||||||
|
|||||||
@@ -163,4 +163,27 @@ func Test_Parse(t *testing.T) {
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("Should parse IIF function", func(t *testing.T) {
|
||||||
|
testQueryParse(
|
||||||
|
t,
|
||||||
|
`SELECT IIF(true, c.pk, c.id) FROM c`,
|
||||||
|
parsers.SelectStmt{
|
||||||
|
SelectItems: []parsers.SelectItem{
|
||||||
|
{
|
||||||
|
Type: parsers.SelectItemTypeFunctionCall,
|
||||||
|
Value: parsers.FunctionCall{
|
||||||
|
Type: parsers.FunctionCallIif,
|
||||||
|
Arguments: []interface{}{
|
||||||
|
testutils.SelectItem_Constant_Bool(true),
|
||||||
|
testutils.SelectItem_Path("c", "pk"),
|
||||||
|
testutils.SelectItem_Path("c", "id"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Table: parsers.Table{SelectItem: testutils.SelectItem_Path("c")},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
+2094
-1820
File diff suppressed because it is too large
Load Diff
+155
-116
@@ -4,137 +4,137 @@ package nosql
|
|||||||
import "github.com/pikami/cosmium/parsers"
|
import "github.com/pikami/cosmium/parsers"
|
||||||
|
|
||||||
func makeSelectStmt(
|
func makeSelectStmt(
|
||||||
columns, fromClause, joinItems,
|
columns, fromClause, joinItems,
|
||||||
whereClause interface{}, distinctClause interface{},
|
whereClause interface{}, distinctClause interface{},
|
||||||
count interface{}, groupByClause interface{}, orderList interface{},
|
count interface{}, groupByClause interface{}, orderList interface{},
|
||||||
offsetClause interface{},
|
offsetClause interface{},
|
||||||
) (parsers.SelectStmt, error) {
|
) (parsers.SelectStmt, error) {
|
||||||
selectStmt := parsers.SelectStmt{
|
selectStmt := parsers.SelectStmt{
|
||||||
SelectItems: columns.([]parsers.SelectItem),
|
SelectItems: columns.([]parsers.SelectItem),
|
||||||
}
|
}
|
||||||
|
|
||||||
if fromTable, ok := fromClause.(parsers.Table); ok {
|
if fromTable, ok := fromClause.(parsers.Table); ok {
|
||||||
selectStmt.Table = fromTable
|
selectStmt.Table = fromTable
|
||||||
}
|
}
|
||||||
|
|
||||||
if joinItemsArray, ok := joinItems.([]interface{}); ok && len(joinItemsArray) > 0 {
|
if joinItemsArray, ok := joinItems.([]interface{}); ok && len(joinItemsArray) > 0 {
|
||||||
selectStmt.JoinItems = make([]parsers.JoinItem, len(joinItemsArray))
|
selectStmt.JoinItems = make([]parsers.JoinItem, len(joinItemsArray))
|
||||||
for i, joinItem := range joinItemsArray {
|
for i, joinItem := range joinItemsArray {
|
||||||
selectStmt.JoinItems[i] = joinItem.(parsers.JoinItem)
|
selectStmt.JoinItems[i] = joinItem.(parsers.JoinItem)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch v := whereClause.(type) {
|
switch v := whereClause.(type) {
|
||||||
case parsers.ComparisonExpression, parsers.LogicalExpression, parsers.Constant, parsers.SelectItem:
|
case parsers.ComparisonExpression, parsers.LogicalExpression, parsers.Constant, parsers.SelectItem:
|
||||||
selectStmt.Filters = v
|
selectStmt.Filters = v
|
||||||
}
|
}
|
||||||
|
|
||||||
if distinctClause != nil {
|
if distinctClause != nil {
|
||||||
selectStmt.Distinct = true
|
selectStmt.Distinct = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if n, ok := count.(int); ok {
|
if n, ok := count.(int); ok {
|
||||||
selectStmt.Count = n
|
selectStmt.Count = n
|
||||||
}
|
}
|
||||||
|
|
||||||
if offsetArr, ok := offsetClause.([]interface{}); ok && len(offsetArr) == 2 {
|
if offsetArr, ok := offsetClause.([]interface{}); ok && len(offsetArr) == 2 {
|
||||||
if n, ok := offsetArr[0].(int); ok {
|
if n, ok := offsetArr[0].(int); ok {
|
||||||
selectStmt.Offset = n
|
selectStmt.Offset = n
|
||||||
}
|
}
|
||||||
|
|
||||||
if n, ok := offsetArr[1].(int); ok {
|
if n, ok := offsetArr[1].(int); ok {
|
||||||
selectStmt.Count = n
|
selectStmt.Count = n
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if orderExpressions, ok := orderList.([]parsers.OrderExpression); ok {
|
if orderExpressions, ok := orderList.([]parsers.OrderExpression); ok {
|
||||||
selectStmt.OrderExpressions = orderExpressions
|
selectStmt.OrderExpressions = orderExpressions
|
||||||
}
|
}
|
||||||
|
|
||||||
if groupByClause != nil {
|
if groupByClause != nil {
|
||||||
selectStmt.GroupBy = groupByClause.([]parsers.SelectItem)
|
selectStmt.GroupBy = groupByClause.([]parsers.SelectItem)
|
||||||
}
|
}
|
||||||
|
|
||||||
return selectStmt, nil
|
return selectStmt, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func makeJoin(table interface{}, column interface{}) (parsers.JoinItem, error) {
|
func makeJoin(table interface{}, column interface{}) (parsers.JoinItem, error) {
|
||||||
joinItem := parsers.JoinItem{}
|
joinItem := parsers.JoinItem{}
|
||||||
|
|
||||||
if selectItem, isSelectItem := column.(parsers.SelectItem); isSelectItem {
|
if selectItem, isSelectItem := column.(parsers.SelectItem); isSelectItem {
|
||||||
joinItem.SelectItem = selectItem
|
joinItem.SelectItem = selectItem
|
||||||
joinItem.Table.Value = selectItem.Alias
|
joinItem.Table.Value = selectItem.Alias
|
||||||
}
|
}
|
||||||
|
|
||||||
if tableTyped, isTable := table.(parsers.Table); isTable {
|
if tableTyped, isTable := table.(parsers.Table); isTable {
|
||||||
joinItem.Table = tableTyped
|
joinItem.Table = tableTyped
|
||||||
}
|
}
|
||||||
|
|
||||||
return joinItem, nil
|
return joinItem, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func makeSelectItem(name interface{}, path interface{}, selectItemType parsers.SelectItemType) (parsers.SelectItem, error) {
|
func makeSelectItem(name interface{}, path interface{}, selectItemType parsers.SelectItemType) (parsers.SelectItem, error) {
|
||||||
ps := path.([]interface{})
|
ps := path.([]interface{})
|
||||||
|
|
||||||
paths := make([]string, 1)
|
paths := make([]string, 1)
|
||||||
paths[0] = name.(string)
|
paths[0] = name.(string)
|
||||||
for _, p := range ps {
|
for _, p := range ps {
|
||||||
paths = append(paths, p.(string))
|
paths = append(paths, p.(string))
|
||||||
}
|
}
|
||||||
|
|
||||||
return parsers.SelectItem{Path: paths, Type: selectItemType}, nil
|
return parsers.SelectItem{Path: paths, Type: selectItemType}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func makeColumnList(column interface{}, other_columns interface{}) ([]parsers.SelectItem, error) {
|
func makeColumnList(column interface{}, other_columns interface{}) ([]parsers.SelectItem, error) {
|
||||||
collsAsArray := other_columns.([]interface{})
|
collsAsArray := other_columns.([]interface{})
|
||||||
columnList := make([]parsers.SelectItem, len(collsAsArray) + 1)
|
columnList := make([]parsers.SelectItem, len(collsAsArray) + 1)
|
||||||
columnList[0] = column.(parsers.SelectItem)
|
columnList[0] = column.(parsers.SelectItem)
|
||||||
|
|
||||||
for i, v := range collsAsArray {
|
for i, v := range collsAsArray {
|
||||||
if col, ok := v.(parsers.SelectItem); ok {
|
if col, ok := v.(parsers.SelectItem); ok {
|
||||||
columnList[i+1] = col
|
columnList[i+1] = col
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return columnList, nil
|
return columnList, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func makeSelectArray(columns interface{}) (parsers.SelectItem, error) {
|
func makeSelectArray(columns interface{}) (parsers.SelectItem, error) {
|
||||||
return parsers.SelectItem{
|
return parsers.SelectItem{
|
||||||
SelectItems: columns.([]parsers.SelectItem),
|
SelectItems: columns.([]parsers.SelectItem),
|
||||||
Type: parsers.SelectItemTypeArray,
|
Type: parsers.SelectItemTypeArray,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func makeSelectObject(field interface{}, other_fields interface{}) (parsers.SelectItem, error) {
|
func makeSelectObject(field interface{}, other_fields interface{}) (parsers.SelectItem, error) {
|
||||||
fieldsAsArray := other_fields.([]interface{})
|
fieldsAsArray := other_fields.([]interface{})
|
||||||
fieldsList := make([]parsers.SelectItem, len(fieldsAsArray)+1)
|
fieldsList := make([]parsers.SelectItem, len(fieldsAsArray)+1)
|
||||||
fieldsList[0] = field.(parsers.SelectItem)
|
fieldsList[0] = field.(parsers.SelectItem)
|
||||||
|
|
||||||
for i, v := range fieldsAsArray {
|
for i, v := range fieldsAsArray {
|
||||||
if col, ok := v.(parsers.SelectItem); ok {
|
if col, ok := v.(parsers.SelectItem); ok {
|
||||||
fieldsList[i+1] = col
|
fieldsList[i+1] = col
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return parsers.SelectItem{
|
return parsers.SelectItem{
|
||||||
SelectItems: fieldsList,
|
SelectItems: fieldsList,
|
||||||
Type: parsers.SelectItemTypeObject,
|
Type: parsers.SelectItemTypeObject,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func makeOrderByClause(ex1 interface{}, others interface{}) ([]parsers.OrderExpression, error) {
|
func makeOrderByClause(ex1 interface{}, others interface{}) ([]parsers.OrderExpression, error) {
|
||||||
othersArray := others.([]interface{})
|
othersArray := others.([]interface{})
|
||||||
orderList := make([]parsers.OrderExpression, len(othersArray)+1)
|
orderList := make([]parsers.OrderExpression, len(othersArray)+1)
|
||||||
orderList[0] = ex1.(parsers.OrderExpression)
|
orderList[0] = ex1.(parsers.OrderExpression)
|
||||||
|
|
||||||
for i, v := range othersArray {
|
for i, v := range othersArray {
|
||||||
if col, ok := v.(parsers.OrderExpression); ok {
|
if col, ok := v.(parsers.OrderExpression); ok {
|
||||||
orderList[i+1] = col
|
orderList[i+1] = col
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return orderList, nil
|
return orderList, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func makeOrderExpression(field interface{}, order interface{}) (parsers.OrderExpression, error) {
|
func makeOrderExpression(field interface{}, order interface{}) (parsers.OrderExpression, error) {
|
||||||
@@ -144,8 +144,8 @@ func makeOrderExpression(field interface{}, order interface{}) (parsers.OrderExp
|
|||||||
}
|
}
|
||||||
|
|
||||||
if orderValue, ok := order.(parsers.OrderDirection); ok {
|
if orderValue, ok := order.(parsers.OrderDirection); ok {
|
||||||
value.Direction = orderValue
|
value.Direction = orderValue
|
||||||
}
|
}
|
||||||
|
|
||||||
return value, nil
|
return value, nil
|
||||||
}
|
}
|
||||||
@@ -169,13 +169,13 @@ func joinStrings(array []interface{}) string {
|
|||||||
|
|
||||||
func combineExpressions(ex1 interface{}, exs interface{}, operation parsers.LogicalExpressionType) (interface{}, error) {
|
func combineExpressions(ex1 interface{}, exs interface{}, operation parsers.LogicalExpressionType) (interface{}, error) {
|
||||||
if exs == nil || len(exs.([]interface{})) < 1 {
|
if exs == nil || len(exs.([]interface{})) < 1 {
|
||||||
return ex1, nil
|
return ex1, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return parsers.LogicalExpression{
|
return parsers.LogicalExpression{
|
||||||
Expressions: append([]interface{}{ex1}, exs.([]interface{})...),
|
Expressions: append([]interface{}{ex1}, exs.([]interface{})...),
|
||||||
Operation: operation,
|
Operation: operation,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -204,16 +204,16 @@ TopClause <- Top ws count:Integer {
|
|||||||
return count, nil
|
return count, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
FromClause <- From ws table:TableName selectItem:(ws In ws column:SelectItem { return column, nil }) {
|
FromClause <- From ws table:TableName selectItem:(ws In ws column:SelectItemWithAlias { return column, nil }) {
|
||||||
tableTyped := table.(parsers.Table)
|
tableTyped := table.(parsers.Table)
|
||||||
|
|
||||||
if selectItem != nil {
|
if selectItem != nil {
|
||||||
tableTyped.SelectItem = selectItem.(parsers.SelectItem)
|
tableTyped.SelectItem = selectItem.(parsers.SelectItem)
|
||||||
tableTyped.IsInSelect = true
|
tableTyped.IsInSelect = true
|
||||||
}
|
}
|
||||||
|
|
||||||
return tableTyped, nil
|
return tableTyped, nil
|
||||||
} / From ws column:SelectItem {
|
} / From ws column:SelectItemWithAlias {
|
||||||
tableSelectItem := column.(parsers.SelectItem)
|
tableSelectItem := column.(parsers.SelectItem)
|
||||||
table := parsers.Table{
|
table := parsers.Table{
|
||||||
Value: tableSelectItem.Alias,
|
Value: tableSelectItem.Alias,
|
||||||
@@ -222,11 +222,11 @@ FromClause <- From ws table:TableName selectItem:(ws In ws column:SelectItem { r
|
|||||||
return table, nil
|
return table, nil
|
||||||
} / From ws subQuery:SubQuerySelectItem {
|
} / From ws subQuery:SubQuerySelectItem {
|
||||||
subQueryTyped := subQuery.(parsers.SelectItem)
|
subQueryTyped := subQuery.(parsers.SelectItem)
|
||||||
table := parsers.Table{
|
table := parsers.Table{
|
||||||
Value: subQueryTyped.Alias,
|
Value: subQueryTyped.Alias,
|
||||||
SelectItem: subQueryTyped,
|
SelectItem: subQueryTyped,
|
||||||
}
|
}
|
||||||
return table, nil
|
return table, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
SubQuery <- exists:(exists:Exists ws { return exists, nil })? "(" ws selectStmt:SelectStmt ws ")" {
|
SubQuery <- exists:(exists:Exists ws { return exists, nil })? "(" ws selectStmt:SelectStmt ws ")" {
|
||||||
@@ -251,7 +251,7 @@ SubQuerySelectItem <- subQuery:SubQuery asClause:(ws alias:AsClause { return ali
|
|||||||
return selectItem, nil
|
return selectItem, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
JoinClause <- Join ws table:TableName ws In ws column:SelectItem {
|
JoinClause <- Join ws table:TableName ws In ws column:SelectItemWithAlias {
|
||||||
return makeJoin(table, column)
|
return makeJoin(table, column)
|
||||||
} / Join ws subQuery:SubQuerySelectItem {
|
} / Join ws subQuery:SubQuerySelectItem {
|
||||||
return makeJoin(nil, subQuery)
|
return makeJoin(nil, subQuery)
|
||||||
@@ -265,17 +265,40 @@ Selection <- SelectValueSpec / ColumnList / SelectAsterisk
|
|||||||
|
|
||||||
SelectAsterisk <- "*" {
|
SelectAsterisk <- "*" {
|
||||||
selectItem, _ := makeSelectItem("c", make([]interface{}, 0), parsers.SelectItemTypeField)
|
selectItem, _ := makeSelectItem("c", make([]interface{}, 0), parsers.SelectItemTypeField)
|
||||||
selectItem.IsTopLevel = true
|
selectItem.IsTopLevel = true
|
||||||
return makeColumnList(selectItem, make([]interface{}, 0))
|
return makeColumnList(selectItem, make([]interface{}, 0))
|
||||||
}
|
}
|
||||||
|
|
||||||
ColumnList <- column:SelectItem other_columns:(ws "," ws coll:SelectItem {return coll, nil })* {
|
ColumnList <- column:ExpressionOrSelectItem other_columns:(ws "," ws coll:ExpressionOrSelectItem {return coll, nil })* {
|
||||||
return makeColumnList(column, other_columns)
|
return makeColumnList(column, other_columns)
|
||||||
}
|
}
|
||||||
|
|
||||||
SelectValueSpec <- "VALUE"i ws column:SelectItem {
|
ExpressionOrSelectItem <- expression:OrExpression asClause:AsClause? {
|
||||||
|
switch typedValue := expression.(type) {
|
||||||
|
case parsers.ComparisonExpression, parsers.LogicalExpression:
|
||||||
|
selectItem := parsers.SelectItem{
|
||||||
|
Type: parsers.SelectItemTypeExpression,
|
||||||
|
Value: typedValue,
|
||||||
|
}
|
||||||
|
|
||||||
|
if aliasValue, ok := asClause.(string); ok {
|
||||||
|
selectItem.Alias = aliasValue
|
||||||
|
}
|
||||||
|
|
||||||
|
return selectItem, nil
|
||||||
|
case parsers.SelectItem:
|
||||||
|
if aliasValue, ok := asClause.(string); ok {
|
||||||
|
typedValue.Alias = aliasValue
|
||||||
|
}
|
||||||
|
return typedValue, nil
|
||||||
|
default:
|
||||||
|
return typedValue, nil
|
||||||
|
}
|
||||||
|
} / item:SelectItemWithAlias { return item, nil }
|
||||||
|
|
||||||
|
SelectValueSpec <- "VALUE"i ws column:SelectItemWithAlias {
|
||||||
selectItem := column.(parsers.SelectItem)
|
selectItem := column.(parsers.SelectItem)
|
||||||
selectItem.IsTopLevel = true
|
selectItem.IsTopLevel = true
|
||||||
return makeColumnList(selectItem, make([]interface{}, 0))
|
return makeColumnList(selectItem, make([]interface{}, 0))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -289,19 +312,32 @@ SelectArray <- "[" ws columns:ColumnList ws "]" {
|
|||||||
|
|
||||||
SelectObject <- "{" ws field:SelectObjectField ws other_fields:(ws "," ws coll:SelectObjectField {return coll, nil })* ws "}" {
|
SelectObject <- "{" ws field:SelectObjectField ws other_fields:(ws "," ws coll:SelectObjectField {return coll, nil })* ws "}" {
|
||||||
return makeSelectObject(field, other_fields)
|
return makeSelectObject(field, other_fields)
|
||||||
|
} / "{" ws "}" {
|
||||||
|
return parsers.SelectItem{
|
||||||
|
SelectItems: []parsers.SelectItem{},
|
||||||
|
Type: parsers.SelectItemTypeObject,
|
||||||
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
SelectObjectField <- name:(Identifier / "\"" key:Identifier "\"" { return key, nil }) ws ":" ws selectItem:SelectItem {
|
SelectObjectField <- name:(Identifier / "\"" key:Identifier "\"" { return key, nil }) ws ":" ws selectItem:SelectItem {
|
||||||
item := selectItem.(parsers.SelectItem)
|
item := selectItem.(parsers.SelectItem)
|
||||||
item.Alias = name.(string)
|
item.Alias = name.(string)
|
||||||
return item, nil
|
return item, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
SelectProperty <- name:Identifier path:(DotFieldAccess / ArrayFieldAccess)* {
|
SelectProperty <- name:Identifier path:(DotFieldAccess / ArrayFieldAccess)* {
|
||||||
return makeSelectItem(name, path, parsers.SelectItemTypeField)
|
return makeSelectItem(name, path, parsers.SelectItemTypeField)
|
||||||
}
|
}
|
||||||
|
|
||||||
SelectItem <- selectItem:(SubQuerySelectItem / Literal / FunctionCall / SelectArray / SelectObject / SelectProperty) asClause:AsClause? {
|
SelectItemWithAlias <- selectItem:SelectItem asClause:AsClause? {
|
||||||
|
item := selectItem.(parsers.SelectItem)
|
||||||
|
if aliasValue, ok := asClause.(string); ok {
|
||||||
|
item.Alias = aliasValue
|
||||||
|
}
|
||||||
|
return item, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
SelectItem <- selectItem:(SubQuerySelectItem / Literal / FunctionCall / SelectArray / SelectObject / SelectProperty) {
|
||||||
var itemResult parsers.SelectItem
|
var itemResult parsers.SelectItem
|
||||||
switch typedValue := selectItem.(type) {
|
switch typedValue := selectItem.(type) {
|
||||||
case parsers.SelectItem:
|
case parsers.SelectItem:
|
||||||
@@ -318,11 +354,7 @@ SelectItem <- selectItem:(SubQuerySelectItem / Literal / FunctionCall / SelectAr
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if aliasValue, ok := asClause.(string); ok {
|
return itemResult, nil
|
||||||
itemResult.Alias = aliasValue
|
|
||||||
}
|
|
||||||
|
|
||||||
return itemResult, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
AsClause <- (ws As)? ws !ExcludedKeywords alias:Identifier {
|
AsClause <- (ws As)? ws !ExcludedKeywords alias:Identifier {
|
||||||
@@ -360,10 +392,10 @@ ComparisonExpression <- "(" ws ex:OrExpression ws ")" { return ex, nil }
|
|||||||
return parsers.ComparisonExpression{Left:left,Right:right,Operation:op.(string)}, nil
|
return parsers.ComparisonExpression{Left:left,Right:right,Operation:op.(string)}, nil
|
||||||
} / inv:(Not ws)? ex:SelectItem {
|
} / inv:(Not ws)? ex:SelectItem {
|
||||||
if inv != nil {
|
if inv != nil {
|
||||||
ex1 := ex.(parsers.SelectItem)
|
ex1 := ex.(parsers.SelectItem)
|
||||||
ex1.Invert = true
|
ex1.Invert = true
|
||||||
return ex1, nil
|
return ex1, nil
|
||||||
}
|
}
|
||||||
return ex, nil
|
return ex, nil
|
||||||
} / ex:BooleanLiteral { return ex, nil }
|
} / ex:BooleanLiteral { return ex, nil }
|
||||||
|
|
||||||
@@ -377,10 +409,10 @@ OrderExpression <- field:SelectProperty ws order:OrderDirection? {
|
|||||||
|
|
||||||
OrderDirection <- ("ASC"i / "DESC"i) {
|
OrderDirection <- ("ASC"i / "DESC"i) {
|
||||||
if strings.EqualFold(string(c.text), "DESC") {
|
if strings.EqualFold(string(c.text), "DESC") {
|
||||||
return parsers.OrderDirectionDesc, nil
|
return parsers.OrderDirectionDesc, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return parsers.OrderDirectionAsc, nil
|
return parsers.OrderDirectionAsc, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
Select <- "SELECT"i
|
Select <- "SELECT"i
|
||||||
@@ -442,6 +474,7 @@ BooleanLiteral <- ("true"i / "false"i) {
|
|||||||
FunctionCall <- StringFunctions
|
FunctionCall <- StringFunctions
|
||||||
/ TypeCheckingFunctions
|
/ TypeCheckingFunctions
|
||||||
/ ArrayFunctions
|
/ ArrayFunctions
|
||||||
|
/ ConditionalFunctions
|
||||||
/ InFunction
|
/ InFunction
|
||||||
/ AggregateFunctions
|
/ AggregateFunctions
|
||||||
/ MathFunctions
|
/ MathFunctions
|
||||||
@@ -489,6 +522,8 @@ ArrayFunctions <- ArrayConcatExpression
|
|||||||
/ SetIntersectExpression
|
/ SetIntersectExpression
|
||||||
/ SetUnionExpression
|
/ SetUnionExpression
|
||||||
|
|
||||||
|
ConditionalFunctions <- IifExpression
|
||||||
|
|
||||||
MathFunctions <- MathAbsExpression
|
MathFunctions <- MathAbsExpression
|
||||||
/ MathAcosExpression
|
/ MathAcosExpression
|
||||||
/ MathAsinExpression
|
/ MathAsinExpression
|
||||||
@@ -681,6 +716,10 @@ SetUnionExpression <- "SetUnion"i ws "(" ws set1:SelectItem ws "," ws set2:Selec
|
|||||||
return createFunctionCall(parsers.FunctionCallSetUnion, []interface{}{set1, set2})
|
return createFunctionCall(parsers.FunctionCallSetUnion, []interface{}{set1, set2})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IifExpression <- "IIF"i ws "(" ws condition:SelectItem ws "," ws trueValue:SelectItem ws "," ws falseValue:SelectItem ws ")" {
|
||||||
|
return createFunctionCall(parsers.FunctionCallIif, []interface{}{condition, trueValue, falseValue})
|
||||||
|
}
|
||||||
|
|
||||||
MathAbsExpression <- "ABS"i ws "(" ws ex:SelectItem ws ")" { return createFunctionCall(parsers.FunctionCallMathAbs, []interface{}{ex}) }
|
MathAbsExpression <- "ABS"i ws "(" ws ex:SelectItem ws ")" { return createFunctionCall(parsers.FunctionCallMathAbs, []interface{}{ex}) }
|
||||||
MathAcosExpression <- "ACOS"i ws "(" ws ex:SelectItem ws ")" { return createFunctionCall(parsers.FunctionCallMathAcos, []interface{}{ex}) }
|
MathAcosExpression <- "ACOS"i ws "(" ws ex:SelectItem ws ")" { return createFunctionCall(parsers.FunctionCallMathAcos, []interface{}{ex}) }
|
||||||
MathAsinExpression <- "ASIN"i ws "(" ws ex:SelectItem ws ")" { return createFunctionCall(parsers.FunctionCallMathAsin, []interface{}{ex}) }
|
MathAsinExpression <- "ASIN"i ws "(" ws ex:SelectItem ws ")" { return createFunctionCall(parsers.FunctionCallMathAsin, []interface{}{ex}) }
|
||||||
|
|||||||
@@ -178,4 +178,90 @@ func Test_Parse_Select(t *testing.T) {
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("Should parse SELECT empty object", func(t *testing.T) {
|
||||||
|
testQueryParse(
|
||||||
|
t,
|
||||||
|
`SELECT {} AS obj FROM c`,
|
||||||
|
parsers.SelectStmt{
|
||||||
|
SelectItems: []parsers.SelectItem{
|
||||||
|
{
|
||||||
|
Alias: "obj",
|
||||||
|
Type: parsers.SelectItemTypeObject,
|
||||||
|
SelectItems: []parsers.SelectItem{},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Table: parsers.Table{SelectItem: testutils.SelectItem_Path("c")},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("Should parse comparison expressions in SELECT", func(t *testing.T) {
|
||||||
|
testQueryParse(
|
||||||
|
t,
|
||||||
|
`SELECT c["id"] = "123", c["pk"] > 456 FROM c`,
|
||||||
|
parsers.SelectStmt{
|
||||||
|
SelectItems: []parsers.SelectItem{
|
||||||
|
{
|
||||||
|
Type: parsers.SelectItemTypeExpression,
|
||||||
|
Value: parsers.ComparisonExpression{
|
||||||
|
Operation: "=",
|
||||||
|
Left: testutils.SelectItem_Path("c", "id"),
|
||||||
|
Right: testutils.SelectItem_Constant_String("123"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Type: parsers.SelectItemTypeExpression,
|
||||||
|
Value: parsers.ComparisonExpression{
|
||||||
|
Operation: ">",
|
||||||
|
Left: testutils.SelectItem_Path("c", "pk"),
|
||||||
|
Right: testutils.SelectItem_Constant_Int(456),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Table: parsers.Table{SelectItem: testutils.SelectItem_Path("c")},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("Should parse logical expressions in SELECT", func(t *testing.T) {
|
||||||
|
testQueryParse(
|
||||||
|
t,
|
||||||
|
`SELECT c["id"] = "123" OR c["pk"] > 456, c["isCool"] AND c["hasRizz"] AS isRizzler FROM c`,
|
||||||
|
parsers.SelectStmt{
|
||||||
|
SelectItems: []parsers.SelectItem{
|
||||||
|
{
|
||||||
|
Type: parsers.SelectItemTypeExpression,
|
||||||
|
Value: parsers.LogicalExpression{
|
||||||
|
Operation: parsers.LogicalExpressionTypeOr,
|
||||||
|
Expressions: []interface{}{
|
||||||
|
parsers.ComparisonExpression{
|
||||||
|
Operation: "=",
|
||||||
|
Left: testutils.SelectItem_Path("c", "id"),
|
||||||
|
Right: testutils.SelectItem_Constant_String("123"),
|
||||||
|
},
|
||||||
|
parsers.ComparisonExpression{
|
||||||
|
Operation: ">",
|
||||||
|
Left: testutils.SelectItem_Path("c", "pk"),
|
||||||
|
Right: testutils.SelectItem_Constant_Int(456),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Type: parsers.SelectItemTypeExpression,
|
||||||
|
Alias: "isRizzler",
|
||||||
|
Value: parsers.LogicalExpression{
|
||||||
|
Operation: parsers.LogicalExpressionTypeAnd,
|
||||||
|
Expressions: []interface{}{
|
||||||
|
testutils.SelectItem_Path("c", "isCool"),
|
||||||
|
testutils.SelectItem_Path("c", "hasRizz"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Table: parsers.Table{SelectItem: testutils.SelectItem_Path("c")},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,6 +69,19 @@ func (r rowContext) resolveSelectItem(selectItem parsers.SelectItem) interface{}
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if selectItem.Type == parsers.SelectItemTypeExpression {
|
||||||
|
if typedExpression, ok := selectItem.Value.(parsers.ComparisonExpression); ok {
|
||||||
|
return r.filters_ComparisonExpression(typedExpression)
|
||||||
|
}
|
||||||
|
|
||||||
|
if typedExpression, ok := selectItem.Value.(parsers.LogicalExpression); ok {
|
||||||
|
return r.filters_LogicalExpression(typedExpression)
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.ErrorLn("parsers.SelectItem has incorrect Value type (expected parsers.ComparisonExpression)")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
return r.selectItem_SelectItemTypeField(selectItem)
|
return r.selectItem_SelectItemTypeField(selectItem)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -209,6 +222,9 @@ func (r rowContext) selectItem_SelectItemTypeFunctionCall(functionCall parsers.F
|
|||||||
case parsers.FunctionCallSetUnion:
|
case parsers.FunctionCallSetUnion:
|
||||||
return r.set_Union(functionCall.Arguments)
|
return r.set_Union(functionCall.Arguments)
|
||||||
|
|
||||||
|
case parsers.FunctionCallIif:
|
||||||
|
return r.misc_Iif(functionCall.Arguments)
|
||||||
|
|
||||||
case parsers.FunctionCallMathAbs:
|
case parsers.FunctionCallMathAbs:
|
||||||
return r.math_Abs(functionCall.Arguments)
|
return r.math_Abs(functionCall.Arguments)
|
||||||
case parsers.FunctionCallMathAcos:
|
case parsers.FunctionCallMathAcos:
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
package memoryexecutor_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/pikami/cosmium/parsers"
|
||||||
|
memoryexecutor "github.com/pikami/cosmium/query_executors/memory_executor"
|
||||||
|
testutils "github.com/pikami/cosmium/test_utils"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Test_Execute_Expressions(t *testing.T) {
|
||||||
|
mockData := []memoryexecutor.RowType{
|
||||||
|
map[string]interface{}{"id": "123", "age": 10, "isCool": true},
|
||||||
|
map[string]interface{}{"id": "456", "age": 20, "isCool": false},
|
||||||
|
map[string]interface{}{"id": "789", "age": 30, "isCool": true},
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Run("Should execute comparison expressions in SELECT", func(t *testing.T) {
|
||||||
|
testQueryExecute(
|
||||||
|
t,
|
||||||
|
parsers.SelectStmt{
|
||||||
|
SelectItems: []parsers.SelectItem{
|
||||||
|
{
|
||||||
|
Path: []string{"c", "id"},
|
||||||
|
Type: parsers.SelectItemTypeField,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Alias: "isAdult",
|
||||||
|
Type: parsers.SelectItemTypeExpression,
|
||||||
|
Value: parsers.ComparisonExpression{
|
||||||
|
Operation: ">=",
|
||||||
|
Left: testutils.SelectItem_Path("c", "age"),
|
||||||
|
Right: testutils.SelectItem_Constant_Int(18),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Alias: "isNotCool",
|
||||||
|
Type: parsers.SelectItemTypeExpression,
|
||||||
|
Value: parsers.ComparisonExpression{
|
||||||
|
Operation: "!=",
|
||||||
|
Left: testutils.SelectItem_Path("c", "isCool"),
|
||||||
|
Right: testutils.SelectItem_Constant_Bool(true),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Table: parsers.Table{SelectItem: testutils.SelectItem_Path("c")},
|
||||||
|
},
|
||||||
|
mockData,
|
||||||
|
[]memoryexecutor.RowType{
|
||||||
|
map[string]interface{}{"id": "123", "isAdult": false, "isNotCool": false},
|
||||||
|
map[string]interface{}{"id": "456", "isAdult": true, "isNotCool": true},
|
||||||
|
map[string]interface{}{"id": "789", "isAdult": true, "isNotCool": false},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("Should execute logical expressions in SELECT", func(t *testing.T) {
|
||||||
|
testQueryExecute(
|
||||||
|
t,
|
||||||
|
parsers.SelectStmt{
|
||||||
|
SelectItems: []parsers.SelectItem{
|
||||||
|
{
|
||||||
|
Path: []string{"c", "id"},
|
||||||
|
Type: parsers.SelectItemTypeField,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Alias: "isCoolAndAdult",
|
||||||
|
Type: parsers.SelectItemTypeExpression,
|
||||||
|
Value: parsers.LogicalExpression{
|
||||||
|
Operation: parsers.LogicalExpressionTypeAnd,
|
||||||
|
Expressions: []interface{}{
|
||||||
|
testutils.SelectItem_Path("c", "isCool"),
|
||||||
|
parsers.ComparisonExpression{
|
||||||
|
Operation: ">=",
|
||||||
|
Left: testutils.SelectItem_Path("c", "age"),
|
||||||
|
Right: testutils.SelectItem_Constant_Int(18),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Table: parsers.Table{SelectItem: testutils.SelectItem_Path("c")},
|
||||||
|
},
|
||||||
|
mockData,
|
||||||
|
[]memoryexecutor.RowType{
|
||||||
|
map[string]interface{}{"id": "123", "isCoolAndAdult": false},
|
||||||
|
map[string]interface{}{"id": "456", "isCoolAndAdult": false},
|
||||||
|
map[string]interface{}{"id": "789", "isCoolAndAdult": true},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -16,3 +16,16 @@ func (r rowContext) misc_In(arguments []interface{}) bool {
|
|||||||
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r rowContext) misc_Iif(arguments []interface{}) interface{} {
|
||||||
|
if len(arguments) != 3 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
condition := r.resolveSelectItem(arguments[0].(parsers.SelectItem))
|
||||||
|
if condition != nil && condition == true {
|
||||||
|
return r.resolveSelectItem(arguments[1].(parsers.SelectItem))
|
||||||
|
}
|
||||||
|
|
||||||
|
return r.resolveSelectItem(arguments[2].(parsers.SelectItem))
|
||||||
|
}
|
||||||
|
|||||||
@@ -210,4 +210,35 @@ func Test_Execute(t *testing.T) {
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("Should execute function IIF()", func(t *testing.T) {
|
||||||
|
testQueryExecute(
|
||||||
|
t,
|
||||||
|
parsers.SelectStmt{
|
||||||
|
SelectItems: []parsers.SelectItem{
|
||||||
|
testutils.SelectItem_Path("c", "id"),
|
||||||
|
{
|
||||||
|
Alias: "coolness",
|
||||||
|
Type: parsers.SelectItemTypeFunctionCall,
|
||||||
|
Value: parsers.FunctionCall{
|
||||||
|
Type: parsers.FunctionCallIif,
|
||||||
|
Arguments: []interface{}{
|
||||||
|
testutils.SelectItem_Path("c", "isCool"),
|
||||||
|
testutils.SelectItem_Constant_String("real cool"),
|
||||||
|
testutils.SelectItem_Constant_String("not cool"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Table: parsers.Table{SelectItem: testutils.SelectItem_Path("c")},
|
||||||
|
},
|
||||||
|
mockData,
|
||||||
|
[]memoryexecutor.RowType{
|
||||||
|
map[string]interface{}{"id": "12345", "coolness": "not cool"},
|
||||||
|
map[string]interface{}{"id": "67890", "coolness": "real cool"},
|
||||||
|
map[string]interface{}{"id": "456", "coolness": "real cool"},
|
||||||
|
map[string]interface{}{"id": "123", "coolness": "real cool"},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -205,4 +205,27 @@ func Test_Execute_Select(t *testing.T) {
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("Should execute SELECT empty object", func(t *testing.T) {
|
||||||
|
testQueryExecute(
|
||||||
|
t,
|
||||||
|
parsers.SelectStmt{
|
||||||
|
SelectItems: []parsers.SelectItem{
|
||||||
|
{
|
||||||
|
Alias: "obj",
|
||||||
|
Type: parsers.SelectItemTypeObject,
|
||||||
|
SelectItems: []parsers.SelectItem{},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Table: parsers.Table{SelectItem: testutils.SelectItem_Path("c")},
|
||||||
|
},
|
||||||
|
mockData,
|
||||||
|
[]memoryexecutor.RowType{
|
||||||
|
map[string]interface{}{"obj": map[string]interface{}{}},
|
||||||
|
map[string]interface{}{"obj": map[string]interface{}{}},
|
||||||
|
map[string]interface{}{"obj": map[string]interface{}{}},
|
||||||
|
map[string]interface{}{"obj": map[string]interface{}{}},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user