* Fix problem found after testing -- in-place modification of $column

prevented accessing configuration. It might have been nice to use $qcolumn or something...
interchange · May 24, 2016 · ef7dc05 · ef7dc05
1 parent c897a8d
commit ef7dc05
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/lib/Vend/Table/DBI.pm b/lib/Vend/Table/DBI.pm
@@ -1892,7 +1892,16 @@ sub set_field {
 
 	my $rawkey = $key;
 	my $rawval = $value;
-    	$column = $s->[$DBI]->quote_identifier($column) if $s->[$CONFIG]{QUOTE_IDENTIFIERS};
+
+	my $extra = '';
+	if( my $f = $s->[$CONFIG]{TIMESTAMP_FIELD} and exists $s->[$CONFIG]{NO_UPDATE}{$column} ) {
+		$f = $s->[$DBI]->quote_identifier($f) if $s->[$CONFIG]->{QUOTE_IDENTIFIERS};
+		$extra = "$f = $f, ";
+	}
+
+	# Would have preferred that this was not invasive, eliminates possibility
+	# of accessing column configuration below this
+	$column = $s->[$DBI]->quote_identifier($column) if $s->[$CONFIG]{QUOTE_IDENTIFIERS};
 
 	my $q;
 	if(! $s->record_exists($rawkey)) {
@@ -1906,12 +1915,6 @@ sub set_field {
 		}
 	}
 
-	my $extra = '';
-	if( my $f = $s->[$CONFIG]{TIMESTAMP_FIELD} and exists $s->[$CONFIG]{NO_UPDATE}{$column} ) {
-		$f = $s->[$DBI]->quote_identifier($f) if $s->[$CONFIG]->{QUOTE_IDENTIFIERS};
-		$extra = "$f = $f, ";
-	}
-
 	my @args;
 	if(!$q) {
 		$q = qq{update $s->[$QTABLE] SET $extra$column = ? where $s->[$QKEY] = ?};