Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redo columnDef.UnmarshalJSON #360

Merged
merged 4 commits into from
Jun 19, 2023

Conversation

illia-li
Copy link
Contributor

issue #353.
Added 'complex_type' for all complex types of columns.
Redid columns 'UnmarshalJSON'.

Now complex type column description in JSON looks like it:

        {
          "name": "col5",
          "type": {
          "complex_type": "tuple",
            "coltypes": [
              "varchar",
              "smallint"
            ],
            "frozen": false
          }

Before can`t see complex type that is describe:

        {
          "name": "col5",
          "type": {
            "coltypes": [
              "varchar",
              "smallint"
            ],
            "frozen": false
          }

Copy link
Collaborator

@dkropachev dkropachev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you are touching naming let's name value and key types properly in all complex types, i.e. ValueTypes, KeyTypes accordingly.

pkg/typedef/types_test.go Outdated Show resolved Hide resolved
pkg/typedef/bag.go Outdated Show resolved Hide resolved
@illia-li illia-li marked this pull request as ready for review June 16, 2023 21:42
@illia-li illia-li requested a review from dkropachev June 16, 2023 21:43
Copy link
Collaborator

@dkropachev dkropachev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make a test to marshal/unmarshal cmd/gemini/schema.json

pkg/typedef/columns.go Outdated Show resolved Hide resolved
pkg/typedef/columns.go Outdated Show resolved Hide resolved
pkg/typedef/columns_test.go Outdated Show resolved Hide resolved
*added function that`s adding referenses in 'IndexDef' on 'ColumnDef' for loaded schema from file
*some fixes
@illia-li illia-li requested a review from dkropachev June 18, 2023 03:03
pkg/generators/column.go Outdated Show resolved Hide resolved
pkg/generators/column.go Outdated Show resolved Hide resolved
pkg/jobs/gen_utils_test.go Outdated Show resolved Hide resolved
pkg/jobs/jobs.go Outdated Show resolved Hide resolved
cmd/gemini/root.go Outdated Show resolved Hide resolved
pkg/typedef/columns_test.go Outdated Show resolved Hide resolved
@illia-li illia-li requested a review from dkropachev June 19, 2023 00:01
@dkropachev dkropachev merged commit 126dc09 into scylladb:master Jun 19, 2023
1 check passed
@illia-li illia-li deleted the il/redo-UnmarshalJSON branch June 19, 2023 01:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants