diff --git a/CHANGELOG.md b/CHANGELOG.md index 52e262e76f48456fc4f853679fb90b8c42dbb0c7..c9357d83cd25b22dbc5773fa2bc880344f5f4d85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [0.3] - 2023-01-19 +(Florian Spreckelsen) + +### Added + +* Messages for the Result of `SELECT` queries. + ## [0.2] - 2022-03-25 (Timm Fitschen) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58057e0bf768b85b1ffb7b69de0e0a682b73b466..39d1bdf0a2624c404d7dc029e9e163f061de427c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 3.13) -set(CAOSDB_PROTO_VERSION 0.2.0) +set(CAOSDB_PROTO_VERSION 0.3.0) project("caosdb-proto" VERSION ${CAOSDB_PROTO_VERSION} diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index 6dc4fafcb338ed88b7fa03798b09624d8c51f538..a3d196e1ce803e777a009780f5379c373b866b7c 100644 --- a/RELEASE_GUIDELINES.md +++ b/RELEASE_GUIDELINES.md @@ -19,11 +19,17 @@ guidelines of the CaosDB Project 3. Check all general prerequisites. -4. Prepare [CMakeLists.txt](./CMakeLists.txt): Check the `MAJOR`, `MINOR`, `PATCH` - version variables. +4. Prepare [CMakeLists.txt](./CMakeLists.txt): Check the `CAOSDB_PROTO_VERSION` + version variable. 5. Merge the release branch into the main branch. 6. Tag the latest commit of the main branch with `v<VERSION>`. 7. Delete the release branch. + +8. Prepare the next release cycle by updating + [CMakeLists.txt](./CMakeLists.txt) - bump the version number of + `CAOSDB_PROTO_VERSION` to the next minor number. + +9. Create release on gitlab.indiscale.com and gitlab.com diff --git a/proto/caosdb/entity/v1/main.proto b/proto/caosdb/entity/v1/main.proto index 9938882b114fd3e5820240760e87cce1ce6d02f4..11fd82a5361187f76abf0c8adb44cfd162270d85 100644 --- a/proto/caosdb/entity/v1/main.proto +++ b/proto/caosdb/entity/v1/main.proto @@ -539,17 +539,32 @@ message FindQueryResult { } // A single result row of a SELECT query -message SelectQueryRows { - // The cells of the table row. - repeated string cells = 1; +message SelectQueryRow { + // The cells of the table row contain the value of the SELECT'ed fields. The + // order of the cells follows the order of the columns of the + // SelectQueryHeader. + repeated Value cells = 2; +} + +// A single header column of the result of a SELECT query +message SelectQueryColumn { + // The column name. This is one of the SELECT'ed fields. + string name = 1; +} + +// The header line of the result of a SELECT query +message SelectQueryHeader { + // List of columns in this table. The order defines the order of the cells in + // each of the SelectQueryRows. + repeated SelectQueryColumn columns = 1; } // A table which is a result of a SELECT query message SelectQueryResult { - // A single row which contains the SELECT'ed fields - SelectQueryRows header = 1; + // The header contains the SELECT'ed fields + SelectQueryHeader header = 3; // The actual results - repeated SelectQueryRows data_rows = 2; + repeated SelectQueryRow data_rows = 4; } ///////////////////////////////////////////////////////////////////////////