Merge remote-tracking branch 'origin' into add-debug-dump-packet-option

rheilek · Nov 22, 2020 · 1afdacf · 1afdacf
2 parents b89f04f + dc8a57c
commit 1afdacf
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/command.go b/command.go
@@ -548,8 +548,14 @@ func (stmt *Stmt) read(dataSet *DataSet) error {
 								//}
 								switch dataSet.Cols[x].DataType {
 								case NCHAR:
-									//fmt.Println("string value:", stmt.connection.strConv.Decode(temp))
-									dataSet.currentRow[x] = stmt.connection.strConv.Decode(temp)
+									if stmt.connection.strConv.LangID != dataSet.Cols[x].CharsetID {
+										tempCharset := stmt.connection.strConv.LangID
+										stmt.connection.strConv.LangID = dataSet.Cols[x].CharsetID
+										dataSet.currentRow[x] = stmt.connection.strConv.Decode(temp)
+										stmt.connection.strConv.LangID = tempCharset
+									} else {
+										dataSet.currentRow[x] = stmt.connection.strConv.Decode(temp)
+									}
 								case NUMBER:
 									dataSet.currentRow[x] = converters.DecodeNumber(temp)
 									// if dataSet.Cols[x].Scale == 0 {