From 6f9af10912a037e2a1de7e942cd8461dc263f2c3 Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Sat, 16 Sep 2023 22:37:12 -0400
Subject: [PATCH] DbLib: support columns with numeric data

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15662
---
 common/database/database_connection.cpp |  35 ++++++++++++++++++++++--
 qa/data/dblib/database.sqlite           | Bin 139264 -> 139264 bytes
 qa/data/dblib/qa_dblib.kicad_dbl        |  14 +++++++++-
 qa/tests/common/test_database.cpp       |   9 ++++++
 4 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/common/database/database_connection.cpp b/common/database/database_connection.cpp
index 3208bf7525..1b5d9b7689 100644
--- a/common/database/database_connection.cpp
+++ b/common/database/database_connection.cpp
@@ -435,7 +435,22 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
         for( short i = 0; i < results.columns(); ++i )
         {
             std::string column = toUTF8( results.column_name( i ) );
-            aResult[ column ] = toUTF8( results.get<nanodbc::string>( i, NANODBC_TEXT( "" ) ) );
+
+            switch( results.column_datatype( i ) )
+            {
+            case SQL_DOUBLE:
+            case SQL_FLOAT:
+            case SQL_REAL:
+            case SQL_DECIMAL:
+            case SQL_NUMERIC:
+            {
+                aResult[column] = fmt::format( "{:G}", results.get<double>( i ) );
+                break;
+            }
+
+            default:
+                aResult[column] = toUTF8( results.get<nanodbc::string>( i, NANODBC_TEXT( "" ) ) );
+            }
         }
     }
     catch( nanodbc::database_error& e )
@@ -534,7 +549,23 @@ bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::strin
             for( short j = 0; j < results.columns(); ++j )
             {
                 std::string column = toUTF8( results.column_name( j ) );
-                result[column] = toUTF8( results.get<nanodbc::string>( j, NANODBC_TEXT( "" ) ) );
+
+                switch( results.column_datatype( j ) )
+                {
+                case SQL_DOUBLE:
+                case SQL_FLOAT:
+                case SQL_REAL:
+                case SQL_DECIMAL:
+                case SQL_NUMERIC:
+                {
+                    result[column] = fmt::format( "{:G}", results.get<double>( j ) );
+                    break;
+                }
+
+                default:
+                    result[column] = toUTF8( results.get<nanodbc::string>( j,
+                                                                           NANODBC_TEXT( "" ) ) );
+                }
             }
 
             aResults.emplace_back( std::move( result ) );
diff --git a/qa/data/dblib/database.sqlite b/qa/data/dblib/database.sqlite
index 41b992b6f98ecb5537f0a73b4cb5a72f16e6fa9f..4d9be4e18c52a15fc5ada07df84a6cb84287fa20 100644
GIT binary patch
delta 301
zcmZoTz|nAkV}i7x00RSq5)i{c%tReyQ2_?MWJX@T0tObI)eL;A`6_r;^I30p6yWCG
zT+gk;$kohi%`UE}$k>{?`2tTMqm+VkesPIHUTJP>QD(A^f^TARu|i6IX;Mz=W(B^7
zioCoN7?^n;GVrnUJmlL5H0LspaH9^BfV8Bcthc+SxTvJCs5m?O<ePRqN)AkEVBo-W
z1_aLXM=_Lx)p=`5g4J<OUSyjp+^Eh7(GC}82a5MgJ1_;lZk5{+)TqV`k+;<pg&FT;
h*QR9u-xv%W1R%x(y}b<886a11z+BPfu*`w+0RX-mPR{@U

delta 188
zcmZoTz|nAkV}i6G4+8^(5)i{c)I=R)Q62`pWJX@T0tObIV+?$&`6_sh@mX(n6yWCG
zT+gk;II&fltEtGEU0hL-u~mQbR-Qn{$<O$uHe2%@Q{?4OWnku=$iO?1?*yMAP){?j
zV52M}pR}Z*thcwOq^P8@sQ6?lyMDn&5oU;}t)?hM^oU)XV51ZhMAThV93q-y-@^iQ
Q-Ry~t)0-TYIWRr|0PEf=hyVZp

diff --git a/qa/data/dblib/qa_dblib.kicad_dbl b/qa/data/dblib/qa_dblib.kicad_dbl
index 865eb4c684..4066e66462 100644
--- a/qa/data/dblib/qa_dblib.kicad_dbl
+++ b/qa/data/dblib/qa_dblib.kicad_dbl
@@ -102,6 +102,18 @@
                     "name": "Voltage Rating",
                     "visible_on_add": true,
                     "visible_in_chooser": true
+                },
+                {
+                    "column": "Cost",
+                    "name": "Cost",
+                    "visible_on_add": false,
+                    "visible_in_chooser": true
+                },
+                {
+                    "column": "Mass",
+                    "name": "Mass",
+                    "visible_on_add": false,
+                    "visible_in_chooser": true
                 }
             ],
             "properties": {
@@ -109,4 +121,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/qa/tests/common/test_database.cpp b/qa/tests/common/test_database.cpp
index 8e2e99f8a6..c0de3e4d00 100644
--- a/qa/tests/common/test_database.cpp
+++ b/qa/tests/common/test_database.cpp
@@ -54,6 +54,8 @@ BOOST_AUTO_TEST_CASE( Connect )
     }
 
     dc.Connect();
+    dc.CacheTableInfo( "Resistors", { "Part ID", "MPN" } );
+    dc.CacheTableInfo( "Capacitors", { "Part ID", "Cost" } );
     BOOST_CHECK( dc.IsConnected() );
 
     DATABASE_CONNECTION::ROW result;
@@ -64,6 +66,13 @@ BOOST_AUTO_TEST_CASE( Connect )
     BOOST_CHECK( result.count( "MPN" ) );
     BOOST_CHECK_NO_THROW( std::any_cast<std::string>( result.at( "MPN" ) ) );
     BOOST_CHECK_EQUAL( std::any_cast<std::string>( result.at( "MPN" ) ), "RC0603FR-0710KL" );
+
+    BOOST_CHECK( dc.SelectOne( "Capacitors", std::make_pair( "Part ID", "CAP-003" ), result ) );
+
+    BOOST_CHECK( !result.empty() );
+    BOOST_CHECK( result.count( "Cost" ) );
+    BOOST_CHECK_NO_THROW( std::any_cast<std::string>( result.at( "Cost" ) ) );
+    BOOST_CHECK_EQUAL( std::any_cast<std::string>( result.at( "Cost" ) ), "1.95" );
 }
 
 BOOST_AUTO_TEST_SUITE_END()