Add column names to database INSERTs

config/Windows/newbatch.xml

@@ -324,13 +324,13 @@
 				checkQuery.exec("SELECT 1 FROM machine WHERE id = " + selectedRoasterID);
 				if(!checkQuery.next())
 				{
-					checkQuery.prepare("INSERT INTO machine VALUES(:id, :name)");
+					checkQuery.prepare("INSERT INTO machine (id, name) VALUES(:id, :name)");
 					checkQuery.bind(":id", selectedRoasterID);
 					checkQuery.bind(":name", selectedRoasterName);
 					checkQuery.exec();
 				}
 				checkQuery = checkQuery.invalidate();
-				var q = "INSERT INTO files VALUES(default, :name, 'profile', NULL, :data) RETURNING id";
+				var q = "INSERT INTO files (id, name, type, note, file) VALUES(default, :name, 'profile', NULL, :data) RETURNING id";
 				query = new QSqlQuery();
 				query.prepare(q);
 				query.bind(":name", timefield.text + " " + roasted.currentText);
@@ -340,7 +340,7 @@
 				var fileno = query.value(0);
 				var file = new QFile(batch.tempData);
 				file.remove();
-				var q2 = "INSERT INTO roasting_log VALUES(:time, ";
+				var q2 = "INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES(:time, ";
 				q2 = q2 + table.columnArray(0, 32);
 				q2 = q2 + ", ";
 				for(var i = 0; table.data(i, 1, 0).value != ""; i++)
@@ -368,7 +368,7 @@
 				query2.exec();
                 query2 = query2.invalidate();
 				if(target.checked) {
-					var q3 = "INSERT INTO item_files VALUES(:time, :item, '{";
+					var q3 = "INSERT INTO item_files (time, item, files) VALUES(:time, :item, '{";
 					q3 = q3 + fileno;
 					q3 = q3 + "}')";
 					query.prepare(q3);

config/Windows/newroaster.xml

@@ -17,7 +17,7 @@
 			var rnumber = findChildObject(this, 'id');
 			var nrwindow = this;
 			button.clicked.connect(function() {
-				var q = "INSERT INTO machine VALUES (";
+				var q = "INSERT INTO machine (id, name) VALUES (";
 				q = q + rnumber.text;
 				q = q + ", :name)";
 				query = new QSqlQuery();

config/Windows/newsamplebatch.xml

@@ -252,7 +252,7 @@
 			var target = findChildObject(this, 'target');
 			submit.clicked.connect(function() {
 				query = new QSqlQuery();
-				query.prepare("INSERT INTO files VALUES(DEFAULT, :name, 'profile', NULL, :data) RETURNING id");
+				query.prepare("INSERT INTO files (id, name, type, note, file) VALUES(DEFAULT, :name, 'profile', NULL, :data) RETURNING id");
 				query.bind(":name", timefield.text + " " + name.text + " " + profileName.currentText);
 				query.bindFileData(":data", batch.tempData);
 				query.exec();
@@ -262,7 +262,7 @@
 				file.remove();
 				if(target.checked)
 				{
-					query.prepare("INSERT INTO sample_roast_profiles VALUES(:time, :name, :file)");
+					query.prepare("INSERT INTO sample_roast_profiles (time, profile_name, file) VALUES(:time, :name, :file)");
 					query.bind(":time", timefield.text);
 					query.bind(":name", profileName.currentText);
 					query.bind(":file", Number(fileno));
@@ -293,14 +293,14 @@
 					}
 					else
 					{
-						query.prepare("INSERT INTO item_attributes VALUES(DEFAULT, :name) RETURNING id");
+						query.prepare("INSERT INTO item_attributes (id, name) VALUES(DEFAULT, :name) RETURNING id");
 						query.bind(":name", attname);
 						query.exec();
 						query.next();
 						attributes.setData(i, 0, query.value(0), 32);
 					}
 				}
-				query.prepare("INSERT INTO coffee_sample_items VALUES(DEFAULT, :name, NULL, 'lb', 0, 'Coffee: Green Sample', :arrival, :vendor, :attrids, :attrvals, NULL) RETURNING id");
+				query.prepare("INSERT INTO coffee_sample_items (id, name, reference, unit, quantity, category, arrival, vendor, attribute_ids, attribute_values) VALUES(DEFAULT, :name, NULL, 'lb', 0, 'Coffee: Green Sample', :arrival, :vendor, :attrids, :attrvals) RETURNING id");
 				query.bind(":name", name.text);
 				query.bind(":arrival", arrival.date);
 				query.bind(":vendor", vendor.text);
@@ -309,12 +309,12 @@
 				query.exec();
 				query.next();
 				var greenId = query.value(0);
-				query.prepare("INSERT INTO items VALUES(DEFAULT, :name, NULL, 'lb', 0, 'Coffee: Roasted Sample') RETURNING id");
+				query.prepare("INSERT INTO items (id, name, reference, unit, quantity, category) VALUES(DEFAULT, :name, NULL, 'lb', 0, 'Coffee: Roasted Sample') RETURNING id");
 				query.bind(":name", name.text + " " + profileName.currentText);
 				query.exec();
 				query.next();
 				var roastedId = query.value(0);
-				query.prepare("INSERT INTO roasting_log VALUES(:time, :unroastedids, NULL, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files)");
+				query.prepare("INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES(:time, :unroastedids, NULL, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files)");
 				query.bind(":time", timefield.text);
 				query.bind(":unroastedids", "{" + greenId + "}");
 				query.bind(":green", convertToPounds(parseFloat(green.text), GunitBox.currentText));

config/Windows/optime.xml

@@ -63,7 +63,7 @@
 			});
 			submitbutton.clicked.connect(function() {
 				query = new QSqlQuery();
-				var q = "INSERT INTO operational_time VALUES (:machine, :start, :stop, :duration)";
+				var q = "INSERT INTO operational_time (machine, start_time, end_time, duration) VALUES (:machine, :start, :stop, :duration)";
 				query.prepare(q);
 				query.bind(":machine", machine.currentData());
 				query.bind(":start", startline.text);

config/Windows/profilehistory.xml

@@ -51,7 +51,7 @@
 		var currentProfileID;
 		setCurrent.clicked.connect(function() {
 			var query = new QSqlQuery();
-			query.prepare("INSERT INTO item_files VALUES('now', :coffee, :profile)");
+			query.prepare("INSERT INTO item_files (time, item, files) VALUES('now', :coffee, :profile)");
 			query.bind(":coffee", coffeelist.currentData());
 			query.bind(":profile", "{" + currentProfileID + "}");
 			query.exec();

config/Windows/purchase.xml

@@ -203,7 +203,7 @@
             var dateField = findChildObject(this, 'date');
             submitButton.clicked.connect(function() {
                 var query = new QSqlQuery;
-                var q = "INSERT INTO invoices VALUES (default, :invoice, :vendor, :date) RETURNING id";
+                var q = "INSERT INTO invoices (id, invoice, vendor, time) VALUES (default, :invoice, :vendor, :date) RETURNING id";
                 query.prepare(q);
                 query.bind(":invoice", invoiceField.text);
                 query.bind(":vendor", vendorField.currentText);
@@ -246,11 +246,11 @@
                     }
                     if(decafSelection.checked)
                     {
-                        q = "INSERT INTO decaf_coffees VALUES (default, :name, :reference, :unit, 0, 'Coffee: Unroasted', :origin, :region, :producer, :grade, :milling, :drying, :decafMethod) RETURNING id";
+                        q = "INSERT INTO decaf_coffees (id, name, reference, unit, quantity, category, origin, region, producer, grade, milling, drying, decaf_method) VALUES (default, :name, :reference, :unit, 0, 'Coffee: Unroasted', :origin, :region, :producer, :grade, :milling, :drying, :decafMethod) RETURNING id";
                     }
                     else
                     {
-                        q = "INSERT INTO coffees VALUES (default, :name, :reference, :unit, 0, 'Coffee: Unroasted', :origin, :region, :producer, :grade, :milling, :drying) RETURNING id";
+                        q = "INSERT INTO coffees (id, name, reference, unit, quantity, category, origin, region, producer, grade, milling, drying) VALUES (default, :name, :reference, :unit, 0, 'Coffee: Unroasted', :origin, :region, :producer, :grade, :milling, :drying) RETURNING id";
                     }
                     query.prepare(q);
                     query.bind(":name", nameEntry.currentText);
@@ -317,7 +317,7 @@
                     query.exec();
                     query.next();
                     var item_id = query.value(0);
-                    q = "INSERT INTO purchase VALUES(:time, :item, :quantity, :cost, :vendor)";
+                    q = "INSERT INTO purchase (time, item, quantity, cost, vendor) VALUES(:time, :item, :quantity, :cost, :vendor)";
                     query.prepare(q);
                     query.bind(":time", dateField.date);
                     query.bind(":item", item_id);
@@ -333,14 +333,14 @@
                     }
                     query.bind(":vendor", vendorField.currentText);
                     query.exec();
-                    q = "INSERT INTO lb_bag_conversion VALUES(:item, :conversion)";
+                    q = "INSERT INTO lb_bag_conversion (item, conversion) VALUES(:item, :conversion)";
                     query.prepare(q);
                     query.bind(":item", item_id);
                     var bagsEntry = findChildObject(current, 'bags');
                     var conversion = convertToPounds(parseFloat(quantityEntry.text), unitEntry.currentText) / Number(bagsEntry.text);
                     query.bind(":conversion", conversion);
                     query.exec();
-                    q = "INSERT INTO invoice_items VALUES(:id, 'PURCHASE', :item, :description, :cost)";
+                    q = "INSERT INTO invoice_items (invoice_id, record_type, item_id, description, cost) VALUES(:id, 'PURCHASE', :item, :description, :cost)";
                     query.prepare(q);
                     query.bind(":id", invoiceNumber);
                     query.bind(":item", item_id);
@@ -356,7 +356,7 @@
                     query.exec();
                     var certifications = findChildObject(current, 'certdisplay');
                     var certlist = certifications.text.split(",");
-                    q = "INSERT INTO certifications VALUES (:item, :certification)";
+                    q = "INSERT INTO certifications (item, certification) VALUES (:item, :certification)";
                     query.prepare(q);
                     query.bind(":item", item_id);
                     for(var j = 0; j < certlist.length; j++)
@@ -366,7 +366,7 @@
                     }
                 }
                 var descriptionArray = sqlToArray(feesTable.columnArray(0, 0));
-                var q = "INSERT INTO invoice_items VALUES (:id, 'FEE', NULL, :description, :cost)";
+                var q = "INSERT INTO invoice_items (invoice_id, record_type, item_id, description, cost) VALUES (:id, 'FEE', NULL, :description, :cost)";
                 query.prepare(q);
                 query.bind(":id", invoiceNumber);
                 if(descriptionArray.length > 0)

config/Windows/roastmanager.xml

@@ -46,7 +46,7 @@
                 window.displayStatus("Item removed.");
             });
             restoreButton.clicked.connect(function() {
-                var q = "INSERT INTO current_items VALUES (:id)";
+                var q = "INSERT INTO current_items (item) VALUES (:id)";
                 query = new QSqlQuery();
                 query.prepare(q);
                 query.bind(":id", drop2.currentData());
@@ -59,14 +59,14 @@
                 window.displayStatus("Item restored.");
             });
             newItemButton.clicked.connect(function() {
-                var q = "INSERT INTO items VALUES (default, :name, NULL, 'lb', 0, 'Coffee: Roasted') RETURNING id";
+                var q = "INSERT INTO items (id, name, reference, unit, quantity, category) VALUES (default, :name, NULL, 'lb', 0, 'Coffee: Roasted') RETURNING id";
                 query = new QSqlQuery();
                 query.prepare(q);
                 query.bind(":name", itemname.text);
                 query.exec();
                 query.next();
                 var i = query.value(0);
-                q = "INSERT INTO current_items VALUES(:id)";
+                q = "INSERT INTO current_items (item) VALUES(:id)";
                 query.prepare(q);
                 query.bind(":id", i);
                 query.exec();