From 9ddbd585a62ff1ad56e9ee6fef5898ced1932a88 Mon Sep 17 00:00:00 2001
From: jonathan vanasco <jonathan@2xlp.com>
Date: Wed, 28 Oct 2020 14:35:39 -0400
Subject: Apply underscore naming to several more operators

The operator changes are:

* `isfalse` is now `is_false`
* `isnot_distinct_from` is now `is_not_distinct_from`
* `istrue` is now `is_true`
* `notbetween` is now `not_between`
* `notcontains` is now `not_contains`
* `notendswith` is now `not_endswith`
* `notilike` is now `not_ilike`
* `notlike` is now `not_like`
* `notmatch` is now `not_match`
* `notstartswith` is now `not_startswith`
* `nullsfirst` is now `nulls_first`
* `nullslast` is now `nulls_last`

Because these are core operators, the internal migration strategy for this
change is to support legacy terms for an extended period of time -- if not
indefinitely -- but update all documentation, tutorials, and internal usage
to the new terms.  The new terms are used to define the functions, and
the legacy terms have been deprecated into aliases of the new terms.

Fixes: #5435
Change-Id: Ifbd7cb1cdda5981990243c4fc4b4ff467dc132ac
---
 test/sql/test_query.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'test/sql/test_query.py')

diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index 9f66a2ef5..7d05462ab 100644
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -480,7 +480,7 @@ class QueryTest(fixtures.TestBase):
         for labels in False, True:
             a_eq(
                 users.select(
-                    order_by=[users.c.user_name.nullsfirst()],
+                    order_by=[users.c.user_name.nulls_first()],
                     use_labels=labels,
                 ),
                 [(1, None), (3, "a"), (2, "b")],
@@ -488,14 +488,15 @@ class QueryTest(fixtures.TestBase):
 
             a_eq(
                 users.select(
-                    order_by=[users.c.user_name.nullslast()], use_labels=labels
+                    order_by=[users.c.user_name.nulls_last()],
+                    use_labels=labels,
                 ),
                 [(3, "a"), (2, "b"), (1, None)],
             )
 
             a_eq(
                 users.select(
-                    order_by=[asc(users.c.user_name).nullsfirst()],
+                    order_by=[asc(users.c.user_name).nulls_first()],
                     use_labels=labels,
                 ),
                 [(1, None), (3, "a"), (2, "b")],
@@ -503,7 +504,7 @@ class QueryTest(fixtures.TestBase):
 
             a_eq(
                 users.select(
-                    order_by=[asc(users.c.user_name).nullslast()],
+                    order_by=[asc(users.c.user_name).nulls_last()],
                     use_labels=labels,
                 ),
                 [(3, "a"), (2, "b"), (1, None)],
@@ -511,7 +512,7 @@ class QueryTest(fixtures.TestBase):
 
             a_eq(
                 users.select(
-                    order_by=[users.c.user_name.desc().nullsfirst()],
+                    order_by=[users.c.user_name.desc().nulls_first()],
                     use_labels=labels,
                 ),
                 [(1, None), (2, "b"), (3, "a")],
@@ -519,7 +520,7 @@ class QueryTest(fixtures.TestBase):
 
             a_eq(
                 users.select(
-                    order_by=[users.c.user_name.desc().nullslast()],
+                    order_by=[users.c.user_name.desc().nulls_last()],
                     use_labels=labels,
                 ),
                 [(2, "b"), (3, "a"), (1, None)],
@@ -527,7 +528,7 @@ class QueryTest(fixtures.TestBase):
 
             a_eq(
                 users.select(
-                    order_by=[desc(users.c.user_name).nullsfirst()],
+                    order_by=[desc(users.c.user_name).nulls_first()],
                     use_labels=labels,
                 ),
                 [(1, None), (2, "b"), (3, "a")],
@@ -535,7 +536,7 @@ class QueryTest(fixtures.TestBase):
 
             a_eq(
                 users.select(
-                    order_by=[desc(users.c.user_name).nullslast()],
+                    order_by=[desc(users.c.user_name).nulls_last()],
                     use_labels=labels,
                 ),
                 [(2, "b"), (3, "a"), (1, None)],
@@ -543,7 +544,10 @@ class QueryTest(fixtures.TestBase):
 
             a_eq(
                 users.select(
-                    order_by=[users.c.user_name.nullsfirst(), users.c.user_id],
+                    order_by=[
+                        users.c.user_name.nulls_first(),
+                        users.c.user_id,
+                    ],
                     use_labels=labels,
                 ),
                 [(1, None), (3, "a"), (2, "b")],
@@ -551,7 +555,7 @@ class QueryTest(fixtures.TestBase):
 
             a_eq(
                 users.select(
-                    order_by=[users.c.user_name.nullslast(), users.c.user_id],
+                    order_by=[users.c.user_name.nulls_last(), users.c.user_id],
                     use_labels=labels,
                 ),
                 [(3, "a"), (2, "b"), (1, None)],
-- 
cgit v1.2.1