Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / db / test_utils.py

diff --git a/test/python/db/test_utils.py b/test/python/db/test_utils.py
index 9eea7ed101eb1421ad67e69124634d87076f1ab2..e0be962f09e8fe991840d6533b87c3ad05ff9585 100644 (file)
--- a/test/python/db/test_utils.py
+++ b/test/python/db/test_utils.py
@@ -1,3 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2022 by the Nominatim developer community.
+# For a full list of authors see the git log.

 """
 Tests for DB utility functions in db.utils
 """
 """
 Tests for DB utility functions in db.utils
 """


@@ -59,7 +65,7 @@ class TestCopyBuffer:
 
     @pytest.fixture(autouse=True)
     def setup_test_table(self, table_factory):
 
     @pytest.fixture(autouse=True)
     def setup_test_table(self, table_factory):

-        table_factory(self.TABLE_NAME, 'colA INT, colB TEXT')
+        table_factory(self.TABLE_NAME, 'col_a INT, col_b TEXT')

 
 
     def table_rows(self, cursor):
 
 
     def table_rows(self, cursor):


@@ -86,7 +92,7 @@ class TestCopyBuffer:
             buf.add('foo')
 
             buf.copy_out(temp_db_cursor, self.TABLE_NAME,
             buf.add('foo')
 
             buf.copy_out(temp_db_cursor, self.TABLE_NAME,

-                         columns=['colB'])
+                         columns=['col_b'])

 
         assert self.table_rows(temp_db_cursor) == {(None, 'foo')}
 
 
         assert self.table_rows(temp_db_cursor) == {(None, 'foo')}
 


@@ -97,7 +103,7 @@ class TestCopyBuffer:
             buf.add(' two ', 2)
 
             buf.copy_out(temp_db_cursor, self.TABLE_NAME,
             buf.add(' two ', 2)
 
             buf.copy_out(temp_db_cursor, self.TABLE_NAME,

-                         columns=['colB', 'colA'])
+                         columns=['col_b', 'col_a'])

 
         assert self.table_rows(temp_db_cursor) == {(1, 'one'), (2, ' two ')}
 
 
         assert self.table_rows(temp_db_cursor) == {(1, 'one'), (2, ' two ')}
 


@@ -109,7 +115,7 @@ class TestCopyBuffer:
             buf.add('\\N')
 
             buf.copy_out(temp_db_cursor, self.TABLE_NAME,
             buf.add('\\N')
 
             buf.copy_out(temp_db_cursor, self.TABLE_NAME,

-                         columns=['colB'])
+                         columns=['col_b'])

 
         assert self.table_rows(temp_db_cursor) == {(None, 'foo\tbar'),
                                                    (None, 'sun\nson'),
 
         assert self.table_rows(temp_db_cursor) == {(None, 'foo\tbar'),
                                                    (None, 'sun\nson'),


@@ -122,7 +128,7 @@ class TestCopyBufferJson:
 
     @pytest.fixture(autouse=True)
     def setup_test_table(self, table_factory):
 
     @pytest.fixture(autouse=True)
     def setup_test_table(self, table_factory):

-        table_factory(self.TABLE_NAME, 'colA INT, colB JSONB')
+        table_factory(self.TABLE_NAME, 'col_a INT, col_b JSONB')

 
 
     def table_rows(self, cursor):
 
 
     def table_rows(self, cursor):