From 116bf7adbcec5b7fbd6a550c785894f88259eccf Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Nov 19 2019 17:01:14 +0000 Subject: rename set_record to add_record --- diff --git a/hub/kojihub.py b/hub/kojihub.py index 6dbaef3..2c444de 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -8353,7 +8353,7 @@ class BulkInsertProcessor(object): """Do bulk inserts - it has some limitations compared to InsertProcessor (no rawset, dup_check). - set() is replaced with set_record() to avoid confusion + set() is replaced with add_record() to avoid confusion table - name of the table data - list of dict per record @@ -8405,10 +8405,10 @@ class BulkInsertProcessor(object): def __repr__(self): return "" % vars(self) - def set_record(self, **kwargs): + def add_record(self, **kwargs): """Set whole record via keyword args""" if not kwargs: - raise koji.GenericError("Missing values in BulkInsert.set_record") + raise koji.GenericError("Missing values in BulkInsert.add_record") self.data.append(kwargs) self.columns |= set(kwargs.keys()) @@ -9513,7 +9513,7 @@ def importImageInternal(task_id, build_id, imgdata): continue logger.info('associating installed rpms with %s', archive['id']) for rpm_id in rpm_ids: - insert.set_record(archive_id=archive['id'], rpm_id=rpm_id) + insert.add_record(archive_id=archive['id'], rpm_id=rpm_id) if insert.data: insert.execute() @@ -12514,7 +12514,7 @@ class BuildRoot(object): if rpm_ids: insert = BulkInsertProcessor(table='buildroot_listing') for rpm_id in rpm_ids: - insert.set_record(buildroot_id=self.id, rpm_id=rpm_id, is_update=update) + insert.add_record(buildroot_id=self.id, rpm_id=rpm_id, is_update=update) insert.execute() def setList(self, rpmlist): @@ -12572,7 +12572,7 @@ class BuildRoot(object): if new_archives: insert = BulkInsertProcessor('buildroot_archives') for archive_id in sorted(new_archives): - insert.set_record(buildroot_id=self.id, + insert.add_record(buildroot_id=self.id, project_dep=project, archive_id=archive_id) insert.execute() @@ -12585,7 +12585,7 @@ class BuildRoot(object): insert = BulkInsertProcessor('buildroot_tools_info') for tool in tools: - insert.set_record(buildroot_id=self.id, tool=tool['name'], version=tool['version']) + insert.add_record(buildroot_id=self.id, tool=tool['name'], version=tool['version']) insert.execute() diff --git a/tests/test_hub/test_insert_processor.py b/tests/test_hub/test_insert_processor.py index 8ef3171..eb3b8d2 100644 --- a/tests/test_hub/test_insert_processor.py +++ b/tests/test_hub/test_insert_processor.py @@ -108,7 +108,7 @@ class TestBulkInsertProcessor(unittest.TestCase): self.assertEquals(actual, expected) proc = kojihub.BulkInsertProcessor('sometable') - proc.set_record(foo='bar') + proc.add_record(foo='bar') actual = str(proc) self.assertEquals(actual, expected) @@ -125,7 +125,7 @@ class TestBulkInsertProcessor(unittest.TestCase): cursor.reset_mock() proc = kojihub.BulkInsertProcessor('sometable') - proc.set_record(foo='bar') + proc.add_record(foo='bar') proc.execute() cursor.execute.assert_called_once_with( 'INSERT INTO sometable (foo) VALUES (%(foo0)s)', @@ -138,8 +138,8 @@ class TestBulkInsertProcessor(unittest.TestCase): context.cnx.cursor.return_value = cursor proc = kojihub.BulkInsertProcessor('sometable', data=[{'foo': 'bar1'}]) - proc.set_record(foo='bar2') - proc.set_record(foo='bar3') + proc.add_record(foo='bar2') + proc.add_record(foo='bar3') proc.execute() cursor.execute.assert_called_once_with( 'INSERT INTO sometable (foo) VALUES (%(foo0)s), (%(foo1)s), (%(foo2)s)', @@ -148,23 +148,23 @@ class TestBulkInsertProcessor(unittest.TestCase): def test_missing_values(self): proc = kojihub.BulkInsertProcessor('sometable') - proc.set_record(foo='bar') - proc.set_record(foo2='bar2') + proc.add_record(foo='bar') + proc.add_record(foo2='bar2') with self.assertRaises(koji.GenericError) as cm: str(proc) self.assertEquals(cm.exception.args[0], 'Missing value foo2 in BulkInsert') def test_missing_values_nostrict(self): proc = kojihub.BulkInsertProcessor('sometable', strict=False) - proc.set_record(foo='bar') - proc.set_record(foo2='bar2') + proc.add_record(foo='bar') + proc.add_record(foo2='bar2') actual = str(proc) expected = 'INSERT INTO sometable (foo, foo2) VALUES (%(foo0)s, NULL), (NULL, %(foo21)s)' self.assertEquals(actual, expected) def test_missing_values_explicit_columns(self): proc = kojihub.BulkInsertProcessor('sometable', strict=True, columns=['foo', 'foo2']) - proc.set_record(foo='bar') + proc.add_record(foo='bar') with self.assertRaises(koji.GenericError) as cm: str(proc) self.assertEquals(cm.exception.args[0], 'Missing value foo2 in BulkInsert')