From bc43d14ebfd5c455453aca55bc0183bc09c6dfda Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 3 Feb 2021 11:28:43 +1100 Subject: [PATCH] Change model functions to raw SQL --- .../migrations/0019_auto_20200413_0642.py | 91 ++++++++++++------- 1 file changed, 57 insertions(+), 34 deletions(-) diff --git a/InvenTree/company/migrations/0019_auto_20200413_0642.py b/InvenTree/company/migrations/0019_auto_20200413_0642.py index c3c2f58ea0..ced7ed04c3 100644 --- a/InvenTree/company/migrations/0019_auto_20200413_0642.py +++ b/InvenTree/company/migrations/0019_auto_20200413_0642.py @@ -112,50 +112,67 @@ def associate_manufacturers(apps, schema_editor): # Map company names to company objects companies = {} - for company in Company.objects.all(): - companies[company.name] = company + # Iterate through each company object + cursor = connection.cursor() + response = cursor.execute("select id, name from company_company;") + results = cursor.fetchall() - def link_part(part, name): + for index, row in enumerate(results): + pk, name = row + + companies[name] = pk + + def link_part(part_id, name): """ Attempt to link Part to an existing Company """ # Matches a company name directly if name in companies.keys(): - print(" - Part[{pk}]: '{n}' maps to existing manufacturer".format(pk=part.pk, n=name)) - part.manufacturer = companies[name] - part.save() + print(" - Part[{pk}]: '{n}' maps to existing manufacturer".format(pk=part_id, n=name)) + + manufacturer_id = companies[name] + + query = f"update part_supplierpart set manufacturer_id={manufacturer_id} where id={part_id};" + result = cursor.execute(query) + return True # Have we already mapped this if name in links.keys(): - print(" - Part[{pk}]: Mapped '{n}' - '{c}'".format(pk=part.pk, n=name, c=links[name].name)) - part.manufacturer = links[name] - part.save() + print(" - Part[{pk}]: Mapped '{n}' - '{c}'".format(pk=part_id, n=name, c=links[name].name)) + + query = f"update part_supplierpart set manufacturer_id={manufacturer_id} where id={part_id};" + result = query.execute() return True # Mapping not possible return False - def create_manufacturer(part, input_name, company_name): + def create_manufacturer(part_id, input_name, company_name): """ Create a new manufacturer """ - company = Company(name=company_name, description=company_name, is_manufacturer=True) + # Manually create a new database row + # Note: Have to fill out all empty string values! + new_manufacturer_query = f"insert into company_company ('name', 'description', 'is_customer', 'is_supplier', 'is_manufacturer', 'address', 'website', 'phone', 'email', 'contact', 'link', 'notes') values ('{company_name}', '{company_name}', false, false, true, '', '', '', '', '', '', '');" - company.is_manufacturer = True - - # Save the company BEFORE we associate the part, otherwise the PK does not exist - company.save() + cursor = connection.cursor() + + cursor.execute(new_manufacturer_query) + + # Extract the company back from the database + response = cursor.execute(f"select id from company_company where name='{company_name}';") + row = response.fetchone() + manufacturer_id = int(row[0]) # Map both names to the same company - links[input_name] = company - links[company_name] = company + links[input_name] = manufacturer_id + links[company_name] = manufacturer_id - companies[company_name] = company + companies[company_name] = manufacturer_id - print(" - Part[{pk}]: Created new manufacturer: '{name}'".format(pk=part.pk, name=company_name)) + print(" - Part[{pk}]: Created new manufacturer: '{name}'".format(pk=part_id, name=company_name)) - # Save the manufacturer reference link - part.manufacturer = company - part.save() + # Update SupplierPart object in the database + cursor.execute(f"update part_supplierpart set manufacturer_id={manufacturer_id} where id={part_id};") def find_matches(text, threshold=65): """ @@ -178,17 +195,17 @@ def associate_manufacturers(apps, schema_editor): return [] - def map_part_to_manufacturer(part, idx, total): + def map_part_to_manufacturer(part_id, idx, total): - name = get_manufacturer_name(part.id) + name = get_manufacturer_name(part_id) # Skip empty names if not name or len(name) == 0: - print(" - Part[{pk}]: No manufacturer_name provided, skipping".format(pk=part.pk)) + print(" - Part[{pk}]: No manufacturer_name provided, skipping".format(pk=part_id)) return # Can be linked to an existing manufacturer - if link_part(part, name): + if link_part(part_id, name): return # Find a list of potential matches @@ -198,7 +215,7 @@ def associate_manufacturers(apps, schema_editor): # Present a list of options print("----------------------------------") - print("Checking part [{pk}] ({idx} of {total})".format(pk=part.pk, idx=idx+1, total=total)) + print("Checking part [{pk}] ({idx} of {total})".format(pk=part_id, idx=idx+1, total=total)) print("Manufacturer name: '{n}'".format(n=name)) print("----------------------------------") print("Select an option from the list below:") @@ -222,7 +239,7 @@ def associate_manufacturers(apps, schema_editor): # Option 0) is to create a new manufacturer with the current name if n == 0: - create_manufacturer(part, name, name) + create_manufacturer(part_id, name, name) return # Options 1) - n) select an existing manufacturer @@ -270,7 +287,7 @@ def associate_manufacturers(apps, schema_editor): # No match, create a new manufacturer else: - create_manufacturer(part, name, response) + create_manufacturer(part_id, name, response) return clear() @@ -292,16 +309,22 @@ def associate_manufacturers(apps, schema_editor): clear() - part_count = SupplierPart.objects.count() + # Extract all SupplierPart objects from the database + cursor = connection.cursor() + response = cursor.execute("select id, MPN, SKU, manufacturer_id, manufacturer_name from part_supplierpart;") + results = response.fetchall() + part_count = len(results) + # Create a unique set of manufacturer names - for idx, part in enumerate(SupplierPart.objects.all()): + for index, row in enumerate(results): + pk, MPN, SKU, manufacturer_id, manufacturer_name = row - if part.manufacturer is not None: - print(" - Part '{p}' already has a manufacturer associated (skipping)".format(p=part)) + if manufacturer_id is not None: + print(f" - SupplierPart '{pk}' already has a manufacturer associated (skipping)") continue - map_part_to_manufacturer(part, idx, part_count) + map_part_to_manufacturer(pk, index, part_count) print("Done!")