From 20d34c482023e2fedc45f6917c67d372cbcbda0f Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 17 Sep 2015 15:36:51 +0200
Subject: [PATCH] SONAR-6552 fix bad merge

- fix ruby activerecord adapter
- do not package jtds.jar
---
 pom.xml                                                  | 9 ---------
 .../lib/arjdbc/jdbc/type_converter.rb                    | 6 ++++--
 sonar-application/assembly.xml                           | 8 --------
 sonar-application/pom.xml                                | 5 -----
 sonar-db/pom.xml                                         | 5 -----
 5 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 917543527d7..b21b09e3d06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -901,11 +901,6 @@
         <artifactId>postgresql</artifactId>
         <version>9.3-1102-jdbc41</version>
       </dependency>
-      <dependency>
-        <groupId>net.sourceforge.jtds</groupId>
-        <artifactId>jtds</artifactId>
-        <version>1.3.1</version>
-      </dependency>
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>woodstox-core-lgpl</artifactId>
@@ -1523,10 +1518,6 @@
           <groupId>org.postgresql</groupId>
           <artifactId>postgresql</artifactId>
         </dependency>
-        <dependency>
-          <groupId>net.sourceforge.jtds</groupId>
-          <artifactId>jtds</artifactId>
-        </dependency>
         <dependency>
           <!-- this artifact is located in the SonarSource internal repository -->
           <groupId>com.oracle</groupId>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/type_converter.rb b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/type_converter.rb
index eca9da0933d..e51fd76ee9c 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/type_converter.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/type_converter.rb
@@ -48,12 +48,14 @@ module ActiveRecord
                           lambda {|r| r['type_name'] =~ /^integer/i}],  #Num of milliseconds for SQLite3 JDBC Driver
         :timestamp   => [ lambda {|r| Jdbc::Types::TIMESTAMP == r['data_type'].to_i},
                           lambda {|r| r['type_name'] =~ /^timestamp$/i},
-                          lambda {|r| r['type_name'] =~ /^datetime/i},
+                          lambda {|r| r['type_name'] =~ /^datetime$/i},
+                          lambda {|r| r['type_name'] =~ /^datetime.+/i},
                           lambda {|r| r['type_name'] =~ /^date/i},
                           lambda {|r| r['type_name'] =~ /^integer/i}],  #Num of milliseconds for SQLite3 JDBC Driver
         :time        => [ lambda {|r| Jdbc::Types::TIME == r['data_type'].to_i},
                           lambda {|r| r['type_name'] =~ /^time$/i},
-                          lambda {|r| r['type_name'] =~ /^datetime/i},  # For Informix
+                          lambda {|r| r['type_name'] =~ /^datetime$/i},
+                          lambda {|r| r['type_name'] =~ /^datetime.+/i},  # For Informix
                           lambda {|r| r['type_name'] =~ /^date/i},
                           lambda {|r| r['type_name'] =~ /^integer/i}],  #Num of milliseconds for SQLite3 JDBC Driver
         :date        => [ lambda {|r| Jdbc::Types::DATE == r['data_type'].to_i},
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index 932f86ea1e5..5fb7b1b236f 100644
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -113,14 +113,6 @@
       <unpack>false</unpack>
       <scope>provided</scope>
     </dependencySet>
-    <dependencySet>
-      <outputDirectory>lib/jdbc/jtds/</outputDirectory>
-      <includes>
-        <include>net.sourceforge.jtds:jtds</include>
-      </includes>
-      <unpack>false</unpack>
-      <scope>provided</scope>
-    </dependencySet>
     <dependencySet>
       <outputDirectory>lib/jdbc/h2/</outputDirectory>
       <includes>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 5f6fd2eb504..2d8175a095b 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -78,11 +78,6 @@
       <artifactId>postgresql</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>net.sourceforge.jtds</groupId>
-      <artifactId>jtds</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
diff --git a/sonar-db/pom.xml b/sonar-db/pom.xml
index 753d725295b..02ea2ab18a1 100644
--- a/sonar-db/pom.xml
+++ b/sonar-db/pom.xml
@@ -113,11 +113,6 @@
       <artifactId>postgresql</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>net.sourceforge.jtds</groupId>
-      <artifactId>jtds</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-- 
2.39.5