Merge pull request #87 from scraperwiki/86-insert-unicode-column-once

Don't insert unicode names twice: #86

Author: StevenMaude

scraperwiki/sql.py

@@ -342,7 +342,7 @@ def fit_row(connection, row, unique_keys):
         new_column = sqlalchemy.Column(column_name,
                                        get_column_type(column_value))
 
-        if not str(new_column) in list(_State.table.columns.keys()):
+        if not column_name in list(_State.table.columns.keys()):
             new_columns.append(new_column)
             _State.table.append_column(new_column)
 

tests.py

@@ -357,6 +357,11 @@ def test_raises_exception_with_invalid_type_field(self):
 
     # XXX neeed some mocking tests for case of run inside a box
 
+class TestUnicodeColumns(TestCase):
+    maxDiff = None
+    def test_add_column_once_only(self):
+        scraperwiki.sqlite.save(data = {"i": 1, u"a\xa0b": 1}, unique_keys = ['i'])
+        scraperwiki.sqlite.save(data = {"i": 2, u"a\xa0b": 2}, unique_keys = ['i'])
 
 class TestImports(TestCase):