Skip to content

Commit 535244d

Browse files
authored
* spelling: descending [api] Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: greater [api] Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --------- Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
1 parent 355b010 commit 535244d

File tree

5 files changed

+57
-10
lines changed

5 files changed

+57
-10
lines changed

pkgs/gcloud/lib/datastore.dart

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,21 @@ class FilterRelation {
252252
// ignore: constant_identifier_names
253253
static const FilterRelation LessThanOrEqual = FilterRelation._('<=');
254254
// ignore: constant_identifier_names
255-
static const FilterRelation GreatherThan = FilterRelation._('>');
255+
static const FilterRelation GreaterThan = FilterRelation._('>');
256+
257+
/// Old misspelled name for [GreaterThan], retained for compatibility.
258+
///
259+
/// @nodoc
260+
@Deprecated('Use FilterRelation.GreaterThan instead')
261+
static const FilterRelation GreatherThan = GreaterThan;
256262
// ignore: constant_identifier_names
257-
static const FilterRelation GreatherThanOrEqual = FilterRelation._('>=');
263+
static const FilterRelation GreaterThanOrEqual = FilterRelation._('>=');
264+
265+
/// Old misspelled name for [GreaterThanOrEqual], retained for compatibility.
266+
///
267+
/// @nodoc
268+
@Deprecated('Use FilterRelation.GreaterThanOrEqual instead')
269+
static const FilterRelation GreatherThanOrEqual = GreaterThanOrEqual;
258270
// ignore: constant_identifier_names
259271
static const FilterRelation Equal = FilterRelation._('==');
260272

@@ -289,7 +301,13 @@ class OrderDirection {
289301
// ignore: constant_identifier_names
290302
static const OrderDirection Ascending = OrderDirection._('Ascending');
291303
// ignore: constant_identifier_names
292-
static const OrderDirection Decending = OrderDirection._('Decending');
304+
static const OrderDirection Descending = OrderDirection._('Descending');
305+
306+
/// Old misspelled name for [Descending], retained for compatibility.
307+
///
308+
/// @nodoc
309+
@Deprecated('Use OrderDirection.Descending instead')
310+
static const OrderDirection Decending = Descending;
293311

294312
final String name;
295313

pkgs/gcloud/lib/fix_data.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
version: 1
2+
transforms:
3+
- title: 'Rename to Descending'
4+
date: 2024-09-11
5+
element:
6+
uris: ['datastore.dart']
7+
field: 'Decending'
8+
inClass: 'OrderDirection'
9+
changes:
10+
- kind: 'rename'
11+
newName: 'Descending'
12+
- title: 'Rename to GreaterThan'
13+
date: 2024-09-11
14+
element:
15+
uris: ['datastore.dart']
16+
field: 'GreatherThan'
17+
inClass: 'FilterRelation'
18+
changes:
19+
- kind: 'rename'
20+
newName: 'GreaterThan'
21+
- title: 'Rename to GreaterThanOrEqual'
22+
date: 2024-09-11
23+
element:
24+
uris: ['datastore.dart']
25+
field: 'GreatherThanOrEqual'
26+
inClass: 'FilterRelation'
27+
changes:
28+
- kind: 'rename'
29+
newName: 'GreaterThanOrEqual'

pkgs/gcloud/lib/src/datastore_impl.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ class DatastoreImpl implements datastore.Datastore {
205205
datastore.FilterRelation.LessThan: 'LESS_THAN',
206206
datastore.FilterRelation.LessThanOrEqual: 'LESS_THAN_OR_EQUAL',
207207
datastore.FilterRelation.Equal: 'EQUAL',
208-
datastore.FilterRelation.GreatherThan: 'GREATER_THAN',
209-
datastore.FilterRelation.GreatherThanOrEqual: 'GREATER_THAN_OR_EQUAL',
208+
datastore.FilterRelation.GreaterThan: 'GREATER_THAN',
209+
datastore.FilterRelation.GreaterThanOrEqual: 'GREATER_THAN_OR_EQUAL',
210210
};
211211

212212
api.Filter _convertDatastore2ApiFilter(datastore.Filter filter) {

pkgs/gcloud/lib/src/db/db.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ class Query<T extends Model> {
143143
final _relationMapping = const <String, ds.FilterRelation>{
144144
'<': ds.FilterRelation.LessThan,
145145
'<=': ds.FilterRelation.LessThanOrEqual,
146-
'>': ds.FilterRelation.GreatherThan,
147-
'>=': ds.FilterRelation.GreatherThanOrEqual,
146+
'>': ds.FilterRelation.GreaterThan,
147+
'>=': ds.FilterRelation.GreaterThanOrEqual,
148148
'=': ds.FilterRelation.Equal,
149149
};
150150

@@ -211,7 +211,7 @@ class Query<T extends Model> {
211211
void order(String orderString) {
212212
// TODO: validate [orderString] (e.g. is name valid)
213213
if (orderString.startsWith('-')) {
214-
_orders.add(ds.Order(ds.OrderDirection.Decending,
214+
_orders.add(ds.Order(ds.OrderDirection.Descending,
215215
_convertToDatastoreName(orderString.substring(1))));
216216
} else {
217217
_orders.add(ds.Order(

pkgs/gcloud/test/datastore/e2e/datastore_test_impl.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ void runTests(Datastore datastore, String? namespace) {
780780
assert(indexedEntity.length == 1);
781781

782782
var filters = [
783-
Filter(FilterRelation.GreatherThan, queryKey, queryLowerBound),
783+
Filter(FilterRelation.GreaterThan, queryKey, queryLowerBound),
784784
Filter(FilterRelation.LessThan, queryKey, queryUpperbound),
785785
];
786786
var listFilters = [
@@ -795,7 +795,7 @@ void runTests(Datastore datastore, String? namespace) {
795795
Filter(FilterRelation.Equal, testUnindexedProperty, queryIndexValue)
796796
];
797797

798-
var orders = [Order(OrderDirection.Decending, queryKey)];
798+
var orders = [Order(OrderDirection.Descending, queryKey)];
799799

800800
test('query', () async {
801801
await insert(stringNamedEntities, <Entity>[]);

0 commit comments

Comments
 (0)