Skip to content

Commit ecdce4e

Browse files
committed
power to popularity
1 parent db83ae7 commit ecdce4e

File tree

10 files changed

+25
-25
lines changed

10 files changed

+25
-25
lines changed

docs/src/piccolo/design-decisions.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ At any time you can access the __str__ method of a query, to see the underlying
2424

2525
.. code-block:: python
2626
27-
query = Band.select('name').where(Band.power >= 100)
27+
query = Band.select('name').where(Band.popularity >= 100)
2828
2929
print(query)
30-
'SELECT name from band where power > 100'
30+
'SELECT name from band where popularity > 100'

piccolo/query/methods/alter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@dataclasses.dataclass
88
class Rename():
99
"""
10-
Band.alter().rename(Band.power, ‘rating’)
10+
Band.alter().rename(Band.popularity, ‘rating’)
1111
"""
1212
column: Column
1313
new_name: str
@@ -19,7 +19,7 @@ def __str__(self):
1919
@dataclasses.dataclass
2020
class Drop():
2121
"""
22-
Band.alter().drop('power')
22+
Band.alter().drop('popularity')
2323
"""
2424
column: Column
2525

piccolo/table.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def select(cls, *column_names: str) -> Select:
205205
def insert(cls, *rows: 'Table') -> Insert:
206206
"""
207207
await Band.insert(
208-
Band(name="jigglypuff", power=500, manager="florence")
208+
Band(name="jigglypuff", popularity=500, manager="florence")
209209
).run()
210210
"""
211211
query = Insert(
@@ -288,7 +288,7 @@ def raw(cls, sql: str) -> Raw:
288288
@classmethod
289289
def alter(cls) -> Alter:
290290
"""
291-
await Band.alter().rename(Band.power, 'rating')
291+
await Band.alter().rename(Band.popularity, 'rating')
292292
"""
293293
return Alter(
294294
table=cls,

tests/base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ def create_table(self):
2222
id SERIAL PRIMARY KEY,
2323
name VARCHAR(50),
2424
manager VARCHAR(20),
25-
power SMALLINT
25+
popularity SMALLINT
2626
);''')
2727

2828
def insert_row(self):
2929
self.run_sync('''
3030
INSERT INTO band (
3131
name,
3232
manager,
33-
power
33+
popularity
3434
) VALUES (
3535
'pikachu',
3636
'ash',
@@ -42,7 +42,7 @@ def insert_rows(self):
4242
INSERT INTO band (
4343
name,
4444
manager,
45-
power
45+
popularity
4646
) VALUES (
4747
'pikachu',
4848
'ash',

tests/example_project/tables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
class Band(table.Table):
1818
name = columns.Varchar(length=50)
1919
manager = columns.Varchar(length=20)
20-
power = columns.Integer()
20+
popularity = columns.Integer()
2121

2222
class Meta():
2323
db = DB

tests/table/instance/test_delete.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def test_delete(self):
1515
squirtle = Band(
1616
name='squirtle',
1717
manager='Misty',
18-
power=300
18+
popularity=300
1919
)
2020

2121
squirtle.save().run_sync()

tests/table/instance/test_save.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def test_save_new(self):
1919
squirtle = Band(
2020
name='squirtle',
2121
manager='Misty',
22-
power=300
22+
popularity=300
2323
)
2424

2525
query = squirtle.save()

tests/table/test_create.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def test_create_table(self):
1515

1616
# Just do a count to make sure the table was created ok.
1717
response = Band.select(
18-
'name', 'manager', 'power'
18+
'name', 'manager', 'popularity'
1919
).count().run_sync()
2020

2121
self.assertEqual(response[0]['count'], 0)

tests/table/test_select.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def test_query_all_columns(self):
1212

1313
self.assertDictEqual(
1414
response[0],
15-
{'id': 1, 'name': 'pikachu', 'manager': 'ash', 'power': 1000}
15+
{'id': 1, 'name': 'pikachu', 'manager': 'ash', 'popularity': 1000}
1616
)
1717

1818
def test_query_some_columns(self):
@@ -48,7 +48,7 @@ def test_where_greater_than(self):
4848
response = Band.select(
4949
'name'
5050
).where(
51-
Band.power > 1000
51+
Band.popularity > 1000
5252
).run_sync()
5353

5454
print(f'response = {response}')
@@ -64,7 +64,7 @@ def test_where_greater_equal_than(self):
6464
response = Band.select(
6565
'name'
6666
).where(
67-
Band.power >= 1000
67+
Band.popularity >= 1000
6868
).run_sync()
6969

7070
print(f'response = {response}')
@@ -80,7 +80,7 @@ def test_where_less_than(self):
8080
response = Band.select(
8181
'name'
8282
).where(
83-
Band.power < 1000
83+
Band.popularity < 1000
8484
).run_sync()
8585

8686
print(f'response = {response}')
@@ -96,7 +96,7 @@ def test_where_less_equal_than(self):
9696
response = Band.select(
9797
'name'
9898
).where(
99-
Band.power <= 1000
99+
Band.popularity <= 1000
100100
).run_sync()
101101

102102
print(f'response = {response}')
@@ -112,7 +112,7 @@ def test_where_and(self):
112112
response = Band.select(
113113
'name'
114114
).where(
115-
(Band.power <= 1000) & (Band.name.like('%chu'))
115+
(Band.popularity <= 1000) & (Band.name.like('%chu'))
116116
).run_sync()
117117

118118
print(f'response = {response}')
@@ -173,8 +173,8 @@ def test_complex_where(self):
173173
response = Band.select(
174174
'name'
175175
).where(
176-
((Band.power == 2000) & (Band.manager == 'sally')) |
177-
((Band.power == 10) & (Band.manager == 'gordon'))
176+
((Band.popularity == 2000) & (Band.manager == 'sally')) |
177+
((Band.popularity == 10) & (Band.manager == 'gordon'))
178178
).run_sync()
179179

180180
print(f'response = {response}')

tests/test_alter.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ def test_rename(self):
1010
self.insert_row()
1111

1212
Band.alter().rename(
13-
Band.power,
13+
Band.popularity,
1414
'rating'
1515
).run_sync()
1616

1717
response = Band.select().run_sync()
1818

1919
column_names = response[0].keys()
2020
self.assertTrue(
21-
('rating' in column_names) and ('power' not in column_names)
21+
('rating' in column_names) and ('popularity' not in column_names)
2222
)
2323

2424

@@ -28,14 +28,14 @@ def test_drop(self):
2828
self.insert_row()
2929

3030
Band.alter().drop(
31-
Band.power,
31+
Band.popularity,
3232
).run_sync()
3333

3434
response = Band.select().run_sync()
3535

3636
column_names = response[0].keys()
3737
self.assertTrue(
38-
'power' not in column_names
38+
'popularity' not in column_names
3939
)
4040

4141

0 commit comments

Comments
 (0)