From 60f3bf45774966445c6197f523df088244068ed6 Mon Sep 17 00:00:00 2001 From: DavidRosen Date: Tue, 27 Aug 2019 17:22:30 -0400 Subject: [PATCH 1/4] Add example for adding a calculated column --- .../comparison/comparison_with_sql.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/source/getting_started/comparison/comparison_with_sql.rst b/doc/source/getting_started/comparison/comparison_with_sql.rst index 366fdd546f58b..204be4b1ed371 100644 --- a/doc/source/getting_started/comparison/comparison_with_sql.rst +++ b/doc/source/getting_started/comparison/comparison_with_sql.rst @@ -49,6 +49,20 @@ With pandas, column selection is done by passing a list of column names to your Calling the DataFrame without the list of column names would display all columns (akin to SQL's ``*``). +In SQL, you can add a calculated column: + +.. code-block:: sql + + SELECT *, tip/total_bill as tip_rate + FROM tips + LIMIT 5; + +With pandas, you can use the assign() method of a DataFrame to append a new column: + +.. ipython:: python + + tips.assign(tip_rate = tips['tip'] / tips['total_bill']).head(5) + WHERE ----- Filtering in SQL is done via a WHERE clause. From 157d8dea9098a19ec84ed3c6d628cd4c1edf277e Mon Sep 17 00:00:00 2001 From: DavidRosen Date: Tue, 27 Aug 2019 17:56:45 -0400 Subject: [PATCH 2/4] Update doc/source/getting_started/comparison/comparison_with_sql.rst Co-Authored-By: Tom Augspurger --- doc/source/getting_started/comparison/comparison_with_sql.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/getting_started/comparison/comparison_with_sql.rst b/doc/source/getting_started/comparison/comparison_with_sql.rst index 204be4b1ed371..3314541a96742 100644 --- a/doc/source/getting_started/comparison/comparison_with_sql.rst +++ b/doc/source/getting_started/comparison/comparison_with_sql.rst @@ -57,7 +57,7 @@ In SQL, you can add a calculated column: FROM tips LIMIT 5; -With pandas, you can use the assign() method of a DataFrame to append a new column: +With pandas, you can use the :meth:`DataFrame.assign` method of a DataFrame to append a new column: .. ipython:: python From 427a46b9aee5f5ef6064ae24f3e8e3d8b6bda1a2 Mon Sep 17 00:00:00 2001 From: DavidRosen Date: Tue, 27 Aug 2019 18:28:49 -0400 Subject: [PATCH 3/4] try fix lint error: space around = in keyword --- doc/source/getting_started/comparison/comparison_with_sql.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/getting_started/comparison/comparison_with_sql.rst b/doc/source/getting_started/comparison/comparison_with_sql.rst index 3314541a96742..b0443b0e7d2df 100644 --- a/doc/source/getting_started/comparison/comparison_with_sql.rst +++ b/doc/source/getting_started/comparison/comparison_with_sql.rst @@ -61,7 +61,7 @@ With pandas, you can use the :meth:`DataFrame.assign` method of a DataFrame to a .. ipython:: python - tips.assign(tip_rate = tips['tip'] / tips['total_bill']).head(5) + tips.assign(tip_rate=tips['tip']/tips['total_bill']).head(5) WHERE ----- From f0d90f093e2ba4280b6eab080832184ef12289f9 Mon Sep 17 00:00:00 2001 From: DavidRosen Date: Tue, 27 Aug 2019 22:38:31 -0400 Subject: [PATCH 4/4] add space around / operator per lint error --- doc/source/getting_started/comparison/comparison_with_sql.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/getting_started/comparison/comparison_with_sql.rst b/doc/source/getting_started/comparison/comparison_with_sql.rst index b0443b0e7d2df..6a03c06de3699 100644 --- a/doc/source/getting_started/comparison/comparison_with_sql.rst +++ b/doc/source/getting_started/comparison/comparison_with_sql.rst @@ -61,7 +61,7 @@ With pandas, you can use the :meth:`DataFrame.assign` method of a DataFrame to a .. ipython:: python - tips.assign(tip_rate=tips['tip']/tips['total_bill']).head(5) + tips.assign(tip_rate=tips['tip'] / tips['total_bill']).head(5) WHERE -----