You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2009/09/07 11:01:10 UTC

svn commit: r812045 - in /lucene/solr/trunk/contrib/dataimporthandler: CHANGES.txt src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java

Author: shalin
Date: Mon Sep  7 09:01:10 2009
New Revision: 812045

URL: http://svn.apache.org/viewvc?rev=812045&view=rev
Log:
SOLR-1348 -- Support binary field type in convertType logic in JdbcDataSource

Modified:
    lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
    lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java

Modified: lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt?rev=812045&r1=812044&r2=812045&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt Mon Sep  7 09:01:10 2009
@@ -150,7 +150,10 @@
               
 35.SOLR-1235: disallow period (.) in entity names (noble)
 
-36.SOLR-1234: Multiple DIH does not work because all of them write to dataimport.properties. Use the handler name as the properties file name (noble)
+36.SOLR-1234: Multiple DIH does not work because all of them write to dataimport.properties.
+              Use the handler name as the properties file name (noble)
+
+37.SOLR-1348: Support binary field type in convertType logic in JdbcDataSource (shalin)
 
 Optimizations
 ----------------------

Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java?rev=812045&r1=812044&r2=812045&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java Mon Sep  7 09:01:10 2009
@@ -89,6 +89,8 @@
         fieldNameVsType.put(n, Types.DATE);
       else if ("boolean".equals(t))
         fieldNameVsType.put(n, Types.BOOLEAN);
+      else if ("binary".equals(t))
+        fieldNameVsType.put(n, Types.BLOB);
       else
         fieldNameVsType.put(n, Types.VARCHAR);
     }
@@ -307,6 +309,9 @@
             case Types.BOOLEAN:
               result.put(colName, resultSet.getBoolean(colName));
               break;
+            case Types.BLOB:
+              result.put(colName, resultSet.getBytes(colName));
+              break;
             default:
               result.put(colName, resultSet.getString(colName));
               break;