Merge pull request #23 from Arkiv-Network/rvdp/pr

Make QueryBuilder::ColumnString public

Author: r-vdp

cmd/query/main.go

@@ -71,7 +71,7 @@ func main() {
 
 			elapsed := time.Since(startTime)
 
-			logger.Info("query completed", "executionTime", elapsed.Seconds())
+			logger.Info("query completed", "executionTime", elapsed.Seconds(), "entities", len(response.Data))
 
 			enc := json.NewEncoder(os.Stdout)
 			enc.SetIndent("", "  ")

query/exists_method.go

@@ -21,7 +21,7 @@ func (e ExistsEvaluator) EvaluateAST(ast *AST, options *QueryOptions) (*SelectQu
 	builder.queryBuilder.WriteString(strings.Join(
 		[]string{
 			"SELECT",
-			builder.options.columnString(),
+			builder.options.ColumnString(),
 			"FROM payloads AS e",
 		},
 		" ",

query/query_options.go

@@ -191,7 +191,7 @@ func (opts *QueryOptions) GetColumnIndex(column string) (int, error) {
 	return ix, nil
 }
 
-func (opts *QueryOptions) columnString() string {
+func (opts *QueryOptions) ColumnString() string {
 	if len(opts.Columns) == 0 {
 		return "1"
 	}

query/tables_method.go

@@ -34,7 +34,7 @@ func (e TablesEvaluator) EvaluateAST(ast *AST, options *QueryOptions) (*SelectQu
 		builder.queryBuilder.WriteString(strings.Join(
 			[]string{
 				" SELECT",
-				builder.options.columnString(),
+				builder.options.ColumnString(),
 				"FROM",
 				e.EvaluateExpr(ast.Expr, &builder),
 				"AS keys INNER JOIN payloads AS e INDEXED BY payloads_entity_key_index ON keys.entity_key = e.entity_key AND keys.from_block = e.from_block",
@@ -45,7 +45,7 @@ func (e TablesEvaluator) EvaluateAST(ast *AST, options *QueryOptions) (*SelectQu
 		builder.queryBuilder.WriteString(strings.Join(
 			[]string{
 				"SELECT",
-				builder.options.columnString(),
+				builder.options.ColumnString(),
 				"FROM payloads AS e",
 			},
 			" ",