Skip to content

Commit cc8810a

Browse files
oyiptongoyiptong
committed
whitespace fix
1 parent ac0edff commit cc8810a

File tree

2 files changed

+96
-96
lines changed

2 files changed

+96
-96
lines changed

‎redshift_sqlalchemy/dialect.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,45 @@
99

1010
class RedShiftDDLCompiler(PGDDLCompiler):
1111
''' Handles Redshift specific create table syntax.
12-
12+
1313
Users can specify the DISTSTYLE, DISTKEY, SORTKEY and ENCODE properties per
14-
table and per column.
15-
16-
Table level properties can be set using the dialect specific syntax. For
14+
table and per column.
15+
16+
Table level properties can be set using the dialect specific syntax. For
1717
example, to specify a distkey and style you apply the following ::
18-
19-
table = Table(metadata,
18+
19+
table = Table(metadata,
2020
Column('id', Integer, primary_key=True),
2121
Column('name', String),
2222
redshift_diststyle="KEY",
2323
redshift_distkey="id"
2424
redshift_sortkey=["id", "name"]
2525
)
26-
26+
2727
A single sortkey can be applied without a wrapping list ::
28-
29-
table = Table(metadata,
28+
29+
table = Table(metadata,
3030
Column('id', Integer, primary_key=True),
3131
Column('name', String),
3232
redshift_sortkey="id"
3333
)
34-
35-
Column level special syntax can also be applied using the column info
34+
35+
Column level special syntax can also be applied using the column info
3636
dictionary. For example, we can specify the encode for a column ::
37-
38-
table = Table(metadata,
37+
38+
table = Table(metadata,
3939
Column('id', Integer, primary_key=True),
4040
Column('name', String, info={"encode":"lzo"})
4141
)
42-
42+
4343
We can also specify the distkey and sortkey options ::
44-
45-
table = Table(metadata,
44+
45+
table = Table(metadata,
4646
Column('id', Integer, primary_key=True),
47-
Column('name', String,
47+
Column('name', String,
4848
info={"distkey":True, "sortkey":True})
4949
)
50-
50+
5151
'''
5252

5353
def post_create_table(self, table):
@@ -79,13 +79,13 @@ def get_column_specification(self, column, **kwargs):
7979
# removed support for them here.
8080
colspec = self.preparer.format_column(column)
8181
colspec += " " + self.dialect.type_compiler.process(column.type)
82-
82+
8383
colspec += self._fetch_redshift_column_attributes(column)
84-
84+
8585
default = self.get_column_default_string(column)
8686
if default is not None:
8787
colspec += " DEFAULT " + default
88-
88+
8989
if not column.nullable:
9090
colspec += " NOT NULL"
9191
return colspec
@@ -111,7 +111,7 @@ def _fetch_redshift_column_attributes(self, column):
111111
class RedshiftDialect(PGDialect_psycopg2):
112112
name = 'redshift'
113113
ddl_compiler = RedShiftDDLCompiler
114-
114+
115115
construct_arguments = [
116116
(schema.Index, {
117117
"using": False,
@@ -125,7 +125,7 @@ class RedshiftDialect(PGDialect_psycopg2):
125125
'sortkey': None
126126
}),
127127
]
128-
128+
129129
@reflection.cache
130130
def get_pk_constraint(self, connection, table_name, schema=None, **kw):
131131
"""

‎tests/test_ddl_compiler.py

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -14,59 +14,59 @@ class TestDDLCompiler(object):
1414
def compiler(self):
1515
compiler = RedShiftDDLCompiler(RedshiftDialect(), None)
1616
return compiler
17-
17+
1818
def _compare_strings(self, expected, actual):
1919
assert expected is not None, "Expected was None"
2020
assert actual is not None, "Actual was None"
21-
21+
2222
a = [ (c, c.encode('hex')) if c is not None else None for c in expected]
2323
b = [ (c, c.encode('hex')) if c is not None else None for c in actual]
2424
return u"-expected, +actual\n" + u"\n".join(difflib.ndiff(a, b))
25-
25+
2626

2727
def test_create_table_simple(self, compiler):
28-
29-
table = Table('t1',
30-
MetaData(),
31-
Column('id', Integer, primary_key=True),
28+
29+
table = Table('t1',
30+
MetaData(),
31+
Column('id', Integer, primary_key=True),
3232
Column('name', String))
33-
34-
33+
34+
3535
create_table = CreateTable(table)
3636
actual = compiler.process(create_table)
3737
expected = u"\nCREATE TABLE t1 ("\
3838
u"\n\tid INTEGER NOT NULL, "\
3939
u"\n\tname VARCHAR, "\
4040
u"\n\tPRIMARY KEY (id)\n)\n\n"
4141
assert expected == actual, self._compare_strings(expected, actual)
42-
42+
4343
def test_create_table_with_diststyle(self, compiler):
44-
45-
table = Table('t1',
46-
MetaData(),
47-
Column('id', Integer, primary_key=True),
44+
45+
table = Table('t1',
46+
MetaData(),
47+
Column('id', Integer, primary_key=True),
4848
Column('name', String),
4949
redshift_diststyle="EVEN")
50-
51-
50+
51+
5252
create_table = CreateTable(table)
5353
actual = compiler.process(create_table)
5454
expected = u"\nCREATE TABLE t1 ("\
5555
u"\n\tid INTEGER NOT NULL, "\
5656
u"\n\tname VARCHAR, "\
5757
u"\n\tPRIMARY KEY (id)\n) "\
5858
u"DISTSTYLE EVEN\n\n"
59-
assert expected == actual, self._compare_strings(expected, actual)
60-
59+
assert expected == actual, self._compare_strings(expected, actual)
60+
6161
def test_invalid_diststyle(self, compiler):
62-
63-
table = Table('t1',
64-
MetaData(),
65-
Column('id', Integer, primary_key=True),
62+
63+
table = Table('t1',
64+
MetaData(),
65+
Column('id', Integer, primary_key=True),
6666
Column('name', String),
6767
redshift_diststyle="NOTEVEN")
68-
69-
68+
69+
7070
create_table = CreateTable(table)
7171
try:
7272
compiler.process(create_table)
@@ -76,124 +76,124 @@ def test_invalid_diststyle(self, compiler):
7676
assert False, "Error expected"
7777

7878
def test_create_table_with_distkey(self, compiler):
79-
80-
table = Table('t1',
81-
MetaData(),
82-
Column('id', Integer, primary_key=True),
79+
80+
table = Table('t1',
81+
MetaData(),
82+
Column('id', Integer, primary_key=True),
8383
Column('name', String),
8484
redshift_distkey="id")
85-
86-
85+
86+
8787
create_table = CreateTable(table)
8888
actual = compiler.process(create_table)
8989
expected = u"\nCREATE TABLE t1 ("\
9090
u"\n\tid INTEGER NOT NULL, "\
9191
u"\n\tname VARCHAR, "\
9292
u"\n\tPRIMARY KEY (id)\n) "\
9393
u"DISTKEY (id)\n\n"
94-
assert expected == actual, self._compare_strings(expected, actual)
94+
assert expected == actual, self._compare_strings(expected, actual)
9595

9696
def test_create_table_with_sortkey(self, compiler):
97-
98-
table = Table('t1',
99-
MetaData(),
100-
Column('id', Integer, primary_key=True),
97+
98+
table = Table('t1',
99+
MetaData(),
100+
Column('id', Integer, primary_key=True),
101101
Column('name', String),
102102
redshift_sortkey="id")
103-
104-
103+
104+
105105
create_table = CreateTable(table)
106106
actual = compiler.process(create_table)
107107
expected = u"\nCREATE TABLE t1 ("\
108108
u"\n\tid INTEGER NOT NULL, "\
109109
u"\n\tname VARCHAR, "\
110110
u"\n\tPRIMARY KEY (id)\n) "\
111111
u"SORTKEY (id)\n\n"
112-
assert expected == actual, self._compare_strings(expected, actual)
112+
assert expected == actual, self._compare_strings(expected, actual)
113113

114114
def test_create_table_with_multiple_sortkeys(self, compiler):
115-
116-
table = Table('t1',
117-
MetaData(),
118-
Column('id', Integer, primary_key=True),
115+
116+
table = Table('t1',
117+
MetaData(),
118+
Column('id', Integer, primary_key=True),
119119
Column('name', String),
120120
redshift_sortkey=["id", "name"])
121-
122-
121+
122+
123123
create_table = CreateTable(table)
124124
actual = compiler.process(create_table)
125125
expected = u"\nCREATE TABLE t1 ("\
126126
u"\n\tid INTEGER NOT NULL, "\
127127
u"\n\tname VARCHAR, "\
128128
u"\n\tPRIMARY KEY (id)\n) "\
129129
u"SORTKEY (id, name)\n\n"
130-
assert expected == actual, self._compare_strings(expected, actual)
131-
130+
assert expected == actual, self._compare_strings(expected, actual)
131+
132132
def test_create_table_all_together(self, compiler):
133-
table = Table('t1',
134-
MetaData(),
135-
Column('id', Integer, primary_key=True),
133+
table = Table('t1',
134+
MetaData(),
135+
Column('id', Integer, primary_key=True),
136136
Column('name', String),
137137
redshift_diststyle="KEY",
138138
redshift_distkey="id",
139139
redshift_sortkey=["id", "name"])
140-
140+
141141
create_table = CreateTable(table)
142142
actual = compiler.process(create_table)
143143
expected = u"\nCREATE TABLE t1 ("\
144144
u"\n\tid INTEGER NOT NULL, "\
145145
u"\n\tname VARCHAR, "\
146146
u"\n\tPRIMARY KEY (id)\n) "\
147147
u"DISTSTYLE KEY DISTKEY (id) SORTKEY (id, name)\n\n"
148-
assert expected == actual, self._compare_strings(expected, actual)
149-
148+
assert expected == actual, self._compare_strings(expected, actual)
149+
150150
def test_create_column_with_sortkey(self, compiler):
151-
table = Table('t1',
152-
MetaData(),
153-
Column('id', Integer, primary_key=True,
154-
info=dict(sortkey=True)),
151+
table = Table('t1',
152+
MetaData(),
153+
Column('id', Integer, primary_key=True,
154+
info=dict(sortkey=True)),
155155
Column('name', String)
156156
)
157-
158-
157+
158+
159159
create_table = CreateTable(table)
160160
actual = compiler.process(create_table)
161161
expected = u"\nCREATE TABLE t1 ("\
162162
u"\n\tid INTEGER SORTKEY NOT NULL, "\
163163
u"\n\tname VARCHAR, "\
164164
u"\n\tPRIMARY KEY (id)\n)\n\n"
165-
assert expected == actual, self._compare_strings(expected, actual)
165+
assert expected == actual, self._compare_strings(expected, actual)
166166

167167
def test_create_column_with_distkey(self, compiler):
168-
table = Table('t1',
169-
MetaData(),
170-
Column('id', Integer, primary_key=True,
171-
info=dict(distkey=True)),
168+
table = Table('t1',
169+
MetaData(),
170+
Column('id', Integer, primary_key=True,
171+
info=dict(distkey=True)),
172172
Column('name', String)
173173
)
174-
175-
174+
175+
176176
create_table = CreateTable(table)
177177
actual = compiler.process(create_table)
178178
expected = u"\nCREATE TABLE t1 ("\
179179
u"\n\tid INTEGER DISTKEY NOT NULL, "\
180180
u"\n\tname VARCHAR, "\
181181
u"\n\tPRIMARY KEY (id)\n)\n\n"
182-
assert expected == actual, self._compare_strings(expected, actual)
182+
assert expected == actual, self._compare_strings(expected, actual)
183183

184184
def test_create_column_with_encoding(self, compiler):
185-
table = Table('t1',
186-
MetaData(),
187-
Column('id', Integer, primary_key=True,
188-
info=dict(encode="LZO")),
185+
table = Table('t1',
186+
MetaData(),
187+
Column('id', Integer, primary_key=True,
188+
info=dict(encode="LZO")),
189189
Column('name', String)
190190
)
191-
192-
191+
192+
193193
create_table = CreateTable(table)
194194
actual = compiler.process(create_table)
195195
expected = u"\nCREATE TABLE t1 ("\
196196
u"\n\tid INTEGER ENCODE LZO NOT NULL, "\
197197
u"\n\tname VARCHAR, "\
198198
u"\n\tPRIMARY KEY (id)\n)\n\n"
199-
assert expected == actual, self._compare_strings(expected, actual)
199+
assert expected == actual, self._compare_strings(expected, actual)

0 commit comments

Comments
 (0)