From fc89501a629c36477ce99b6a9f0dedd8f6511cfb Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 11 Nov 2020 08:06:14 +1100 Subject: [PATCH] Fix for SQL cursor query - What works in SQLite don't necessarily fly with the big boys --- .../migrations/0026_auto_20201110_1011.py | 18 ++++++++++++------ .../part/migrations/0056_auto_20201110_1125.py | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/InvenTree/company/migrations/0026_auto_20201110_1011.py b/InvenTree/company/migrations/0026_auto_20201110_1011.py index ffaf99842c..24fac6f52d 100644 --- a/InvenTree/company/migrations/0026_auto_20201110_1011.py +++ b/InvenTree/company/migrations/0026_auto_20201110_1011.py @@ -27,11 +27,13 @@ def migrate_currencies(apps, schema_editor): cursor = connection.cursor() # The 'suffix' field denotes the currency code - response = cursor.execute('SELECT id, suffix, description from common_currency;').fetchall() + response = cursor.execute('SELECT id, suffix, description from common_currency;') + + results = cursor.fetchall() remap = {} - for index, row in enumerate(response): + for index, row in enumerate(results): pk, suffix, description = row suffix = suffix.strip().upper() @@ -49,11 +51,13 @@ def migrate_currencies(apps, schema_editor): remap[pk] = suffix # Now iterate through each SupplierPriceBreak and update the rows - response = cursor.execute('SELECT id, cost, currency_id, price, price_currency from part_supplierpricebreak;').fetchall() + response = cursor.execute('SELECT id, cost, currency_id, price, price_currency from part_supplierpricebreak;') + + results = cursor.fetchall() count = 0 - for index, row in enumerate(response): + for index, row in enumerate(results): pk, cost, currency_id, price, price_currency = row # Copy the 'cost' field across to the 'price' field @@ -82,11 +86,13 @@ def reverse_currencies(apps, schema_editor): cursor = connection.cursor() # Extract a list of currency codes which are in use - response = cursor.execute(f'SELECT id, price, price_currency from part_supplierpricebreak;').fetchall() + response = cursor.execute(f'SELECT id, price, price_currency from part_supplierpricebreak;') + + results = cursor.fetchall() codes_in_use = set() - for index, row in enumerate(response): + for index, row in enumerate(results): pk, price, code = row codes_in_use.add(code) diff --git a/InvenTree/part/migrations/0056_auto_20201110_1125.py b/InvenTree/part/migrations/0056_auto_20201110_1125.py index e15409daec..dff86173b6 100644 --- a/InvenTree/part/migrations/0056_auto_20201110_1125.py +++ b/InvenTree/part/migrations/0056_auto_20201110_1125.py @@ -27,11 +27,13 @@ def migrate_currencies(apps, schema_editor): cursor = connection.cursor() # The 'suffix' field denotes the currency code - response = cursor.execute('SELECT id, suffix, description from common_currency;').fetchall() + response = cursor.execute('SELECT id, suffix, description from common_currency;') + + results = cursor.fetchall() remap = {} - for index, row in enumerate(response): + for index, row in enumerate(results): pk, suffix, description = row suffix = suffix.strip().upper() @@ -49,11 +51,13 @@ def migrate_currencies(apps, schema_editor): remap[pk] = suffix # Now iterate through each PartSellPriceBreak and update the rows - response = cursor.execute('SELECT id, cost, currency_id, price, price_currency from part_partsellpricebreak;').fetchall() + response = cursor.execute('SELECT id, cost, currency_id, price, price_currency from part_partsellpricebreak;') + + results = cursor.fetchall() count = 0 - for index, row in enumerate(response): + for index, row in enumerate(results): pk, cost, currency_id, price, price_currency = row # Copy the 'cost' field across to the 'price' field @@ -82,11 +86,13 @@ def reverse_currencies(apps, schema_editor): cursor = connection.cursor() # Extract a list of currency codes which are in use - response = cursor.execute(f'SELECT id, price, price_currency from part_partsellpricebreak;').fetchall() + response = cursor.execute(f'SELECT id, price, price_currency from part_partsellpricebreak;') + + results = cursor.fetchall() codes_in_use = set() - for index, row in enumerate(response): + for index, row in enumerate(results): pk, price, code = row codes_in_use.add(code)