Skip to content

ENH: support index=True/False keyword for io.sql.get_schema #35063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 40 commits into from
Closed
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2e77cef
TST: groupby apply with indexing and colunm aggregation returns the c…
fangchenli Jun 8, 2020
aa3654d
Merge remote-tracking branch 'upstream/master'
fangchenli Jun 14, 2020
ce4db3c
Revert "TST: groupby apply with indexing and colunm aggregation retur…
fangchenli Jun 14, 2020
188b51c
Merge branch 'master' of https://github.com/VirosaLi/pandas
fangchenli Jun 22, 2020
b3fa290
Merge remote-tracking branch 'upstream/master'
fangchenli Jun 27, 2020
96f3769
Merge remote-tracking branch 'upstream/master'
fangchenli Jun 29, 2020
3bab42e
Merge remote-tracking branch 'upstream/master'
fangchenli Jun 30, 2020
31b5d8f
ENH: add index option for SQL git_schema
fangchenli Jun 30, 2020
25745e5
Merge remote-tracking branch 'upstream/master' into sql-get_schema-index
fangchenli Jul 2, 2020
a9faad0
add whatsnew 1.1.0 entry
fangchenli Jul 2, 2020
6c7f002
Merge remote-tracking branch 'upstream/master' into sql-get_schema-index
fangchenli Jul 6, 2020
d077995
fix doc
fangchenli Jul 6, 2020
c96ba29
fix doc
fangchenli Jul 6, 2020
430eaf7
fix doc
fangchenli Jul 6, 2020
7d1886d
fix docstring
fangchenli Jul 6, 2020
089af78
fix docstring
fangchenli Jul 6, 2020
51117e5
Merge remote-tracking branch 'upstream/master' into sql-get_schema-index
fangchenli Jul 6, 2020
d98b4c1
whatsnew
fangchenli Jul 7, 2020
4134dc7
whatsnew
fangchenli Jul 7, 2020
120fa6c
Merge remote-tracking branch 'upstream/master' into sql-get_schema-index
fangchenli Jul 7, 2020
1749a6b
Merge remote-tracking branch 'upstream/master' into sql-get_schema-index
fangchenli Jul 9, 2020
938eca7
fix doc
fangchenli Jul 10, 2020
e695fbb
conflict
fangchenli Jul 12, 2020
7800553
Merge branch 'master' into sql-get_schema-index
fangchenli Aug 17, 2020
d162a0a
resolve conflict
fangchenli Sep 16, 2020
05512c4
update doc
fangchenli Sep 16, 2020
bd0d049
resolve conflict
fangchenli Sep 16, 2020
c071511
Merge branch 'master' into sql-get_schema-index
fangchenli Sep 25, 2020
f18039c
Merge remote-tracking branch 'upstream/master' into sql-get_schema-index
fangchenli Sep 26, 2020
57e83fe
fix doc
fangchenli Sep 26, 2020
7a9e8fc
Update doc/source/whatsnew/v1.2.0.rst
fangchenli Sep 26, 2020
8a33cb6
Merge branch 'master' into sql-get_schema-index
fangchenli Oct 5, 2020
0fc2a6c
Merge branch 'master' into sql-get_schema-index
fangchenli Oct 11, 2020
f247312
Merge branch 'master' into sql-get_schema-index
fangchenli Nov 17, 2020
3a02222
Merge branch 'master' into sql-get_schema-index
fangchenli Dec 8, 2020
70c2101
fix long line
fangchenli Dec 8, 2020
47c2315
Update sql.py
fangchenli Dec 8, 2020
5b152b0
remove pd usage
fangchenli Dec 8, 2020
23f14c4
Update sql.py
fangchenli Dec 8, 2020
0dd76d1
fix docstring
fangchenli Dec 8, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/source/whatsnew/v1.1.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ Other enhancements
- :meth:`DataFrame.to_excel` can now also write OpenOffice spreadsheet (.ods) files (:issue:`27222`)
- :meth:`~Series.explode` now accepts ``ignore_index`` to reset the index, similarly to :meth:`pd.concat` or :meth:`DataFrame.sort_values` (:issue:`34932`).
- :meth:`read_csv` now accepts string values like "0", "0.0", "1", "1.0" as convertible to the nullable boolean dtype (:issue:`34859`)
- :meth:`~pandas.io.sql.get_schema` now accepts `index` parameter to include index of the DataFrame in the schema (:issue:`9084`).

.. ---------------------------------------------------------------------------

Expand Down
17 changes: 11 additions & 6 deletions pandas/io/sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -1454,9 +1454,9 @@ def drop_table(self, table_name, schema=None):
self.get_table(table_name, schema).drop()
self.meta.clear()

def _create_sql_schema(self, frame, table_name, keys=None, dtype=None):
def _create_sql_schema(self, frame, table_name, keys=None, dtype=None, index=False):
table = SQLTable(
table_name, self, frame=frame, index=False, keys=keys, dtype=dtype
table_name, self, frame=frame, index=index, keys=keys, dtype=dtype
)
return str(table.sql_schema())

Expand Down Expand Up @@ -1844,14 +1844,14 @@ def drop_table(self, name, schema=None):
drop_sql = f"DROP TABLE {_get_valid_sqlite_name(name)}"
self.execute(drop_sql)

def _create_sql_schema(self, frame, table_name, keys=None, dtype=None):
def _create_sql_schema(self, frame, table_name, keys=None, dtype=None, index=False):
table = SQLiteTable(
table_name, self, frame=frame, index=False, keys=keys, dtype=dtype
table_name, self, frame=frame, index=index, keys=keys, dtype=dtype
)
return str(table.sql_schema())


def get_schema(frame, name, keys=None, con=None, dtype=None):
def get_schema(frame, name, keys=None, con=None, dtype=None, index=False):
"""
Get the SQL db table schema for the given frame.

Expand All @@ -1869,7 +1869,12 @@ def get_schema(frame, name, keys=None, con=None, dtype=None):
dtype : dict of column name to SQL type, default None
Optional specifying the datatype for columns. The SQL type should
be a SQLAlchemy type, or a string for sqlite3 fallback connection.
index : boolean, default: False
Whether to include the index of the DataFrame in the sql schema
New in version 1.1.0.

"""
pandas_sql = pandasSQL_builder(con=con)
return pandas_sql._create_sql_schema(frame, name, keys=keys, dtype=dtype)
return pandas_sql._create_sql_schema(
frame, name, keys=keys, dtype=dtype, index=index
)
14 changes: 14 additions & 0 deletions pandas/tests/io/test_sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,20 @@ def test_get_schema_keys(self):
constraint_sentence = 'CONSTRAINT test_pk PRIMARY KEY ("A", "B")'
assert constraint_sentence in create_sql

def test_get_schema_with_index(self):
# GH 9084
df = pd.DataFrame({"one": [1, 2, 3], "two": [1, 2, 3]}, index=list("abc"))

schema_without_index = sql.get_schema(df, "test", con=self.conn)
assert "index TEXT" not in schema_without_index

schema_with_index = sql.get_schema(df, "test", index=True, con=self.conn)
assert '"index" TEXT' in schema_with_index

df.index.name = "new_index"
schema_with_index_rename = sql.get_schema(df, "test", index=True, con=self.conn)
assert df.index.name in schema_with_index_rename

def test_chunksize_read(self):
df = DataFrame(np.random.randn(22, 5), columns=list("abcde"))
df.to_sql("test_chunksize", self.conn, index=False)
Expand Down