Skip to content

Commit 1c8de6d

Browse files
committed
sync with master & resolve conflicts.
2 parents deee7e7 + 7b1e3c6 commit 1c8de6d

File tree

10 files changed

+383
-41
lines changed

10 files changed

+383
-41
lines changed

client/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ Class | Method | HTTP request | Description
131131
- [RaiDbSdk.ActionResult](docs/ActionResult.md)
132132
- [RaiDbSdk.Appl](docs/Appl.md)
133133
- [RaiDbSdk.Area](docs/Area.md)
134-
- [RaiDbSdk.ArityMismatchError](docs/ArityMismatchError.md)
135134
- [RaiDbSdk.AzureIntegration](docs/AzureIntegration.md)
136135
- [RaiDbSdk.CSVFileSchema](docs/CSVFileSchema.md)
137136
- [RaiDbSdk.CSVFileSyntax](docs/CSVFileSyntax.md)
@@ -140,13 +139,11 @@ Class | Method | HTTP request | Description
140139
- [RaiDbSdk.ClientProblem](docs/ClientProblem.md)
141140
- [RaiDbSdk.CollectProblemsAction](docs/CollectProblemsAction.md)
142141
- [RaiDbSdk.CollectProblemsActionResult](docs/CollectProblemsActionResult.md)
143-
- [RaiDbSdk.ComparisonChainError](docs/ComparisonChainError.md)
144142
- [RaiDbSdk.Cons](docs/Cons.md)
145143
- [RaiDbSdk.DefaultIntegration](docs/DefaultIntegration.md)
146144
- [RaiDbSdk.ExceptionProblem](docs/ExceptionProblem.md)
147145
- [RaiDbSdk.FileSchema](docs/FileSchema.md)
148146
- [RaiDbSdk.FileSyntax](docs/FileSyntax.md)
149-
- [RaiDbSdk.FrontProblem](docs/FrontProblem.md)
150147
- [RaiDbSdk.ICViolation](docs/ICViolation.md)
151148
- [RaiDbSdk.ImportAction](docs/ImportAction.md)
152149
- [RaiDbSdk.ImportActionResult](docs/ImportActionResult.md)
@@ -196,7 +193,6 @@ Class | Method | HTTP request | Description
196193
- [RaiDbSdk.Token](docs/Token.md)
197194
- [RaiDbSdk.Transaction](docs/Transaction.md)
198195
- [RaiDbSdk.TransactionResult](docs/TransactionResult.md)
199-
- [RaiDbSdk.UndefinedError](docs/UndefinedError.md)
200196
- [RaiDbSdk.UpdateAction](docs/UpdateAction.md)
201197
- [RaiDbSdk.UpdateActionResult](docs/UpdateActionResult.md)
202198
- [RaiDbSdk.WorkspaceLoadProblem](docs/WorkspaceLoadProblem.md)

client/docs/InlineInconsistent.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# RaiDbSdk.InlineInconsistent
2+
3+
## Properties
4+
5+
Name | Type | Description | Notes
6+
------------ | ------------- | ------------- | -------------
7+
**name** | **String** | | [default to '']
8+
**range** | [**Range**](Range.md) | |
9+
10+

client/docs/SetOptionsAction.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
77
**abortOnError** | **Boolean** | | [optional]
8-
**broken** | **Boolean** | | [optional]
98
**debug** | **Boolean** | | [optional]
109
**debugTrace** | **Boolean** | | [optional]
1110
**silent** | **Boolean** | | [optional]

client/docs/ShadowError.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# RaiDbSdk.ShadowError
2+
3+
## Properties
4+
5+
Name | Type | Description | Notes
6+
------------ | ------------- | ------------- | -------------
7+
**range** | [**Range**](Range.md) | |
8+
**shadowed** | [**AnyType**](.md) | | [optional]
9+
**shadower** | [**AnyType**](.md) | | [optional]
10+
**_var** | **String** | | [default to '']
11+
12+

client/src/index.js

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import Action from './model/Action';
1919
import ActionResult from './model/ActionResult';
2020
import Appl from './model/Appl';
2121
import Area from './model/Area';
22-
import ArityMismatchError from './model/ArityMismatchError';
2322
import AzureIntegration from './model/AzureIntegration';
2423
import CSVFileSchema from './model/CSVFileSchema';
2524
import CSVFileSyntax from './model/CSVFileSyntax';
@@ -28,13 +27,11 @@ import CardinalityActionResult from './model/CardinalityActionResult';
2827
import ClientProblem from './model/ClientProblem';
2928
import CollectProblemsAction from './model/CollectProblemsAction';
3029
import CollectProblemsActionResult from './model/CollectProblemsActionResult';
31-
import ComparisonChainError from './model/ComparisonChainError';
3230
import Cons from './model/Cons';
3331
import DefaultIntegration from './model/DefaultIntegration';
3432
import ExceptionProblem from './model/ExceptionProblem';
3533
import FileSchema from './model/FileSchema';
3634
import FileSyntax from './model/FileSyntax';
37-
import FrontProblem from './model/FrontProblem';
3835
import ICViolation from './model/ICViolation';
3936
import ImportAction from './model/ImportAction';
4037
import ImportActionResult from './model/ImportActionResult';
@@ -84,7 +81,6 @@ import SyntaxNode from './model/SyntaxNode';
8481
import Token from './model/Token';
8582
import Transaction from './model/Transaction';
8683
import TransactionResult from './model/TransactionResult';
87-
import UndefinedError from './model/UndefinedError';
8884
import UpdateAction from './model/UpdateAction';
8985
import UpdateActionResult from './model/UpdateActionResult';
9086
import WorkspaceLoadProblem from './model/WorkspaceLoadProblem';
@@ -161,12 +157,6 @@ export {
161157
*/
162158
Area,
163159

164-
/**
165-
* The ArityMismatchError model constructor.
166-
* @property {module:model/ArityMismatchError}
167-
*/
168-
ArityMismatchError,
169-
170160
/**
171161
* The AzureIntegration model constructor.
172162
* @property {module:model/AzureIntegration}
@@ -215,12 +205,6 @@ export {
215205
*/
216206
CollectProblemsActionResult,
217207

218-
/**
219-
* The ComparisonChainError model constructor.
220-
* @property {module:model/ComparisonChainError}
221-
*/
222-
ComparisonChainError,
223-
224208
/**
225209
* The Cons model constructor.
226210
* @property {module:model/Cons}
@@ -251,12 +235,6 @@ export {
251235
*/
252236
FileSyntax,
253237

254-
/**
255-
* The FrontProblem model constructor.
256-
* @property {module:model/FrontProblem}
257-
*/
258-
FrontProblem,
259-
260238
/**
261239
* The ICViolation model constructor.
262240
* @property {module:model/ICViolation}
@@ -551,12 +529,6 @@ export {
551529
*/
552530
TransactionResult,
553531

554-
/**
555-
* The UndefinedError model constructor.
556-
* @property {module:model/UndefinedError}
557-
*/
558-
UndefinedError,
559-
560532
/**
561533
* The UpdateAction model constructor.
562534
* @property {module:model/UpdateAction}
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
/**
2+
* Delve Client SDK
3+
* This is a Client SDK for Delve API
4+
*
5+
* The version of the OpenAPI document: 1.1.3
6+
* Contact: support@relational.ai
7+
*
8+
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
9+
* https://openapi-generator.tech
10+
* Do not edit the class manually.
11+
*
12+
*/
13+
14+
import ApiClient from '../ApiClient';
15+
import FrontProblem from './FrontProblem';
16+
import Range from './Range';
17+
18+
/**
19+
* The InlineInconsistent model module.
20+
* @module model/InlineInconsistent
21+
* @version 1.1.3
22+
*/
23+
class InlineInconsistent {
24+
/**
25+
* Constructs a new <code>InlineInconsistent</code>.
26+
* @alias module:model/InlineInconsistent
27+
* @extends module:model/FrontProblem
28+
* @implements module:model/FrontProblem
29+
* @param type {String}
30+
*/
31+
constructor(type) {
32+
FrontProblem.initialize(this, type);
33+
InlineInconsistent.initialize(this, type);
34+
}
35+
36+
/**
37+
* Initializes the fields of this object.
38+
* This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
39+
* Only for internal use.
40+
*/
41+
static initialize(obj, type) {
42+
obj['name'] = name || '';
43+
obj['range'] = range;
44+
}
45+
46+
/**
47+
* Constructs a <code>InlineInconsistent</code> from a plain JavaScript object, optionally creating a new instance.
48+
* Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
49+
* @param {Object} data The plain JavaScript object bearing properties of interest.
50+
* @param {module:model/InlineInconsistent} obj Optional instance to populate.
51+
* @return {module:model/InlineInconsistent} The populated <code>InlineInconsistent</code> instance.
52+
*/
53+
static constructFromObject(data, obj) {
54+
if (data) {
55+
obj = obj || new InlineInconsistent();
56+
FrontProblem.constructFromObject(data, obj);
57+
FrontProblem.constructFromObject(data, obj);
58+
59+
if (data.hasOwnProperty('name')) {
60+
obj['name'] = ApiClient.convertToType(data['name'], 'String');
61+
}
62+
if (data.hasOwnProperty('range')) {
63+
obj['range'] = Range.constructFromObject(data['range']);
64+
}
65+
}
66+
return obj;
67+
}
68+
69+
70+
}
71+
72+
/**
73+
* @member {String} name
74+
* @default ''
75+
*/
76+
InlineInconsistent.prototype['name'] = '';
77+
78+
/**
79+
* @member {module:model/Range} range
80+
*/
81+
InlineInconsistent.prototype['range'] = undefined;
82+
83+
84+
// Implement FrontProblem interface:
85+
/**
86+
* @member {String} type
87+
* @default ''
88+
*/
89+
FrontProblem.prototype['type'] = '';
90+
91+
92+
93+
94+
export default InlineInconsistent;
95+

client/src/model/SetOptionsAction.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ class SetOptionsAction {
5656
if (data.hasOwnProperty('abort_on_error')) {
5757
obj['abort_on_error'] = ApiClient.convertToType(data['abort_on_error'], 'Boolean');
5858
}
59-
if (data.hasOwnProperty('broken')) {
60-
obj['broken'] = ApiClient.convertToType(data['broken'], 'Boolean');
61-
}
6259
if (data.hasOwnProperty('debug')) {
6360
obj['debug'] = ApiClient.convertToType(data['debug'], 'Boolean');
6461
}
@@ -80,11 +77,6 @@ class SetOptionsAction {
8077
*/
8178
SetOptionsAction.prototype['abort_on_error'] = undefined;
8279

83-
/**
84-
* @member {Boolean} broken
85-
*/
86-
SetOptionsAction.prototype['broken'] = undefined;
87-
8880
/**
8981
* @member {Boolean} debug
9082
*/

client/src/model/ShadowError.js

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
/**
2+
* Delve Client SDK
3+
* This is a Client SDK for Delve API
4+
*
5+
* The version of the OpenAPI document: 1.1.3
6+
* Contact: support@relational.ai
7+
*
8+
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
9+
* https://openapi-generator.tech
10+
* Do not edit the class manually.
11+
*
12+
*/
13+
14+
import ApiClient from '../ApiClient';
15+
import AnyType from './AnyType';
16+
import FrontProblem from './FrontProblem';
17+
import Range from './Range';
18+
19+
/**
20+
* The ShadowError model module.
21+
* @module model/ShadowError
22+
* @version 1.1.3
23+
*/
24+
class ShadowError {
25+
/**
26+
* Constructs a new <code>ShadowError</code>.
27+
* @alias module:model/ShadowError
28+
* @extends module:model/FrontProblem
29+
* @implements module:model/FrontProblem
30+
* @param type {String}
31+
*/
32+
constructor(type) {
33+
FrontProblem.initialize(this, type);
34+
ShadowError.initialize(this, type);
35+
}
36+
37+
/**
38+
* Initializes the fields of this object.
39+
* This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
40+
* Only for internal use.
41+
*/
42+
static initialize(obj, type) {
43+
obj['range'] = range;
44+
obj['var'] = _var || '';
45+
}
46+
47+
/**
48+
* Constructs a <code>ShadowError</code> from a plain JavaScript object, optionally creating a new instance.
49+
* Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
50+
* @param {Object} data The plain JavaScript object bearing properties of interest.
51+
* @param {module:model/ShadowError} obj Optional instance to populate.
52+
* @return {module:model/ShadowError} The populated <code>ShadowError</code> instance.
53+
*/
54+
static constructFromObject(data, obj) {
55+
if (data) {
56+
obj = obj || new ShadowError();
57+
FrontProblem.constructFromObject(data, obj);
58+
FrontProblem.constructFromObject(data, obj);
59+
60+
if (data.hasOwnProperty('range')) {
61+
obj['range'] = Range.constructFromObject(data['range']);
62+
}
63+
if (data.hasOwnProperty('shadowed')) {
64+
obj['shadowed'] = ApiClient.convertToType(data['shadowed'], AnyType);
65+
}
66+
if (data.hasOwnProperty('shadower')) {
67+
obj['shadower'] = ApiClient.convertToType(data['shadower'], AnyType);
68+
}
69+
if (data.hasOwnProperty('var')) {
70+
obj['var'] = ApiClient.convertToType(data['var'], 'String');
71+
}
72+
}
73+
return obj;
74+
}
75+
76+
77+
}
78+
79+
/**
80+
* @member {module:model/Range} range
81+
*/
82+
ShadowError.prototype['range'] = undefined;
83+
84+
/**
85+
* @member {module:model/AnyType} shadowed
86+
*/
87+
ShadowError.prototype['shadowed'] = undefined;
88+
89+
/**
90+
* @member {module:model/AnyType} shadower
91+
*/
92+
ShadowError.prototype['shadower'] = undefined;
93+
94+
/**
95+
* @member {String} var
96+
* @default ''
97+
*/
98+
ShadowError.prototype['var'] = '';
99+
100+
101+
// Implement FrontProblem interface:
102+
/**
103+
* @member {String} type
104+
* @default ''
105+
*/
106+
FrontProblem.prototype['type'] = '';
107+
108+
109+
110+
111+
export default ShadowError;
112+

0 commit comments

Comments
 (0)