From dc488e75a75dbd4c357149a0e7b2cfef9724a127 Mon Sep 17 00:00:00 2001 From: JCharante Date: Wed, 18 Oct 2017 10:27:51 -0400 Subject: [PATCH 1/4] refactor: pep 8 --- sqldemo.py | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/sqldemo.py b/sqldemo.py index ebf5e75..aa8de1b 100644 --- a/sqldemo.py +++ b/sqldemo.py @@ -5,32 +5,28 @@ from sqlalchemy.sql import text - engine = create_engine('sqlite:///:memory:', echo=True) -def main(): - conn = engine.connect() - metadata = MetaData() - createTables(metadata, conn) - s = text("SELECT users.fullname AS title FROM users") - statement = text("INSERT INTO users (name, fullname) values ('hal', 'Halsted Matthew Larsson')") - conn.execute(statement) - - query = text("Select * from users") - result = conn.execute(query).fetchall() - print(result) - - +def main(): + conn = engine.connect() + metadata = MetaData() + createTables(metadata, conn) + s = text("SELECT users.fullname AS title FROM users") + statement = text("INSERT INTO users (name, fullname) values ('hal', 'Halsted Matthew Larsson')") + conn.execute(statement) + query = text("Select * from users") + result = conn.execute(query).fetchall() + print(result) def createTables(metadata, conn): - users = Table('users', metadata, - Column('id', Integer, primary_key=True), - Column('name', String), - Column('fullname', String)) + users = Table('users', metadata, + Column('id', Integer, primary_key=True), + Column('name', String), + Column('fullname', String)) - metadata.create_all(engine) + metadata.create_all(engine) main() From 8a139a9f1b5afb0242c0942937f751a2590c930c Mon Sep 17 00:00:00 2001 From: JCharante Date: Wed, 18 Oct 2017 10:29:04 -0400 Subject: [PATCH 2/4] refactor: pep 8 --- sqldemo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sqldemo.py b/sqldemo.py index aa8de1b..a91f77c 100644 --- a/sqldemo.py +++ b/sqldemo.py @@ -29,4 +29,5 @@ def createTables(metadata, conn): metadata.create_all(engine) + main() From e6c0713b5a9bc9aaf3174a5271b790c923545518 Mon Sep 17 00:00:00 2001 From: JCharante Date: Wed, 18 Oct 2017 10:33:48 -0400 Subject: [PATCH 3/4] refactor: pep 8 --- sqldemo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sqldemo.py b/sqldemo.py index a91f77c..bbf5c75 100644 --- a/sqldemo.py +++ b/sqldemo.py @@ -11,7 +11,7 @@ def main(): conn = engine.connect() metadata = MetaData() - createTables(metadata, conn) + create_tables(metadata, conn) s = text("SELECT users.fullname AS title FROM users") statement = text("INSERT INTO users (name, fullname) values ('hal', 'Halsted Matthew Larsson')") conn.execute(statement) @@ -21,7 +21,7 @@ def main(): print(result) -def createTables(metadata, conn): +def create_tables(metadata, conn): users = Table('users', metadata, Column('id', Integer, primary_key=True), Column('name', String), From 2207a21b40b863d62083651350ba77b2cd7f4ce8 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 20 Oct 2017 02:33:37 -0400 Subject: [PATCH 4/4] indent with space --- sqldemo.py | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/sqldemo.py b/sqldemo.py index 612406a..0d3796a 100644 --- a/sqldemo.py +++ b/sqldemo.py @@ -7,49 +7,49 @@ def main(): - conn = engine.connect() - metadata = MetaData() - create_tables(metadata, conn) - statement = text("INSERT INTO users (id, name, fullname, age)" - " values (1, 'hal','Halsted Matthew Larsson', 37)") - conn.execute(statement) + conn = engine.connect() + metadata = MetaData() + create_tables(metadata, conn) + statement = text("INSERT INTO users (id, name, fullname, age)" + " values (1, 'hal','Halsted Matthew Larsson', 37)") + conn.execute(statement) - statement = text("INSERT INTO users (id, name, fullname, age)" - " values (2, 'Emma','Emma Doovid Judith Harringtowne', " + str(random.randint(10, 16)) + ")") - conn.execute(statement) + statement = text("INSERT INTO users (id, name, fullname, age)" + " values (2, 'Emma','Emma Doovid Judith Harringtowne', " + str(random.randint(10, 16)) + ")") + conn.execute(statement) - statement = text("INSERT INTO pets (name, age, userid)" - " values ('Josie', 4, 1)") - conn.execute(statement) + statement = text("INSERT INTO pets (name, age, userid)" + " values ('Josie', 4, 1)") + conn.execute(statement) - statement = text("INSERT INTO pets (name, age, userid)" - " values ('Bobbi', 24, 2)") - conn.execute(statement) + statement = text("INSERT INTO pets (name, age, userid)" + " values ('Bobbi', 24, 2)") + conn.execute(statement) - statement = text("INSERT INTO pets (name, age, userid)" - " values ('Bubbles', 14, 2)") - conn.execute(statement) + statement = text("INSERT INTO pets (name, age, userid)" + " values ('Bubbles', 14, 2)") + conn.execute(statement) - query = text("SELECT users.name, pets.name from pets JOIN users ON pets.userid = users.id") - result = conn.execute(query).fetchall() - print(result) + query = text("SELECT users.name, pets.name from pets JOIN users ON pets.userid = users.id") + result = conn.execute(query).fetchall() + print(result) def create_tables(metadata, conn): - users = Table('users', - metadata, - Column('id', Integer, primary_key=True), - Column('name', String), - Column('age', Integer), - Column('fullname', String),) - - pets = Table('pets', - metadata, - Column('id', Integer, primary_key=True), - Column('userId', Integer), - Column('name', String), - Column('age', Integer),) - metadata.create_all(engine) + users = Table('users', + metadata, + Column('id', Integer, primary_key=True), + Column('name', String), + Column('age', Integer), + Column('fullname', String),) + + pets = Table('pets', + metadata, + Column('id', Integer, primary_key=True), + Column('userId', Integer), + Column('name', String), + Column('age', Integer),) + metadata.create_all(engine) main()