Update on duplicate key; small fixes

consolibyte · Jan 9, 2024 · c7ce2bf · c7ce2bf
1 parent a844fac
commit c7ce2bf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/QuickBooks/Callbacks/SQL/Callbacks.php b/QuickBooks/Callbacks/SQL/Callbacks.php
@@ -8097,8 +8097,8 @@ protected static function _deleteChildren($table, $user, $action, $ID, $object,
 						{
 							$deleted[$key][QUICKBOOKS_TXNLINEID][$arr[QUICKBOOKS_TXNLINEID]] = array(
 								$arr[QUICKBOOKS_DRIVER_SQL_FIELD_ID],
-								$arr[QUICKBOOKS_DRIVER_SQL_FIELD_USERNAME_ID],
-								$arr[QUICKBOOKS_DRIVER_SQL_FIELD_EXTERNAL_ID] );
+								$arr[QUICKBOOKS_DRIVER_SQL_FIELD_USERNAME_ID] ?? null,
+								$arr[QUICKBOOKS_DRIVER_SQL_FIELD_EXTERNAL_ID] ?? null);
 						}
 					}
 

diff --git a/QuickBooks/Driver/Sql.php b/QuickBooks/Driver/Sql.php
@@ -3680,10 +3680,6 @@ public function insert($table, $object, $discov_and_resync = true)
 			if (!strncmp($field,'qbsql_',6)) {
 				$qbsql_fields[] = $field;
 				$qbsql_values[] = $this->fmtValue($field,$value);
-				if ($field == QUICKBOOKS_DRIVER_SQL_FIELD_ID) {
-					$fields[] = $field;
-					$values[] = $this->fmtValue($field,$value);
-				}
 			}
 			elseif (array_key_exists($field,$avail)) {
 				$fields[] = $field;
@@ -3702,13 +3698,13 @@ public function insert($table, $object, $discov_and_resync = true)
 		$errnum = 0;
 		$errmsg = '';
 
-		$sql = "INSERT INTO quickbooks_qbsql (".implode(',',$qbsql_fields).") VALUES (".implode(',',$qbsql_values).")";
+		$updatesSql = implode(',',array_map(function($s){return "$s=values($s)";}, $qbsql_fields));
+		$sql = "INSERT INTO quickbooks_qbsql (".implode(',',$qbsql_fields).") VALUES (".implode(',',$qbsql_values).") ON DUPLICATE KEY UPDATE $updatesSql";
 		if (!$this->_query($sql, $errnum, $errmsg)) return false;
 		$qbsql_id = $this->last();
 
-		$fields[] = 'qbsql_id';
-		$values[] = $qbsql_id;
-		$sql = "INSERT INTO $table (".implode(',',$fields).") VALUES (".implode(',',$values).")";
+		$updatesSql = implode(',',array_map(function($s){return "$s=values($s)";}, $fields));
+		$sql = "INSERT INTO $table (".QUICKBOOKS_DRIVER_SQL_FIELD_ID.",".implode(',',$fields).") VALUES ($qbsql_id,".implode(',',$values).") ON DUPLICATE KEY UPDATE $updatesSql";
 
 		return $this->_query($sql, $errnum, $errmsg);
 	}

diff --git a/QuickBooks/Utilities.php b/QuickBooks/Utilities.php
@@ -762,6 +762,8 @@ static public function actionToObject($action)
 	{
 		static $cache = array();
 
+		if ($action === null) return null;
+
 		if (isset($cache[$action]))
 		{
 			//print('returning cached [' . $action . ']' . "\n");