gooddata-dss-jdbc 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1de31f85f33278531fceb013494ce6b74f2a71bd
-  data.tar.gz: 85cb1db8cfe3644df9361f922b1e648e5cfff16e
+  metadata.gz: 6ce8a40877d819241fb1d7109019558b7af3a91d
+  data.tar.gz: 6856d8e9116db0f32888cd1a273fd338c3772475
 SHA512:
-  metadata.gz: 70f95bfb39bbf8251fe689971879ffbd8cd7c07d09f0083ac797a82828614d02b8d1ce6e49642c6dba6d5ca1599087ea13f7f53ad5807fca56a2e6243b378435
-  data.tar.gz: 97269bf702ee9d80cc39f10600f319467e97655cfe84e82d80e796284125c383d25b0d769219e5c3353a69896326ff55c5ec9063d342add4b73652bdee2b11f1
+  metadata.gz: 2d2448371db637ff3cef1eb4b2338f4a948f11f6d221c6abf03c1999d2f373d8dd1387d44a520937313f748d635b018c67229ade6d35e9ee670c07377e239280
+  data.tar.gz: 32389c76f69c7ca8ddf3970fbcacb85a26d7262ca63a1a31715c95336350edc1da684798951359831bd5aecda15e7ae85cb169c5f9ca53b41fcc08898bcaed4a

data/lib/jdbc/dss.rb

@@ -5,7 +5,8 @@ rescue
 end
 
 require 'jdbc/dss/version'
-require 'slf4j-jars'
+require 'slf4j-api-1.7.25.jar'
+require 'slf4j-simple-1.7.25.jar'
 
 # JDBC Wrapper
 module Jdbc

data/lib/jdbc/dss.rb.orig

@@ -0,0 +1,38 @@
+begin
+  JRUBY_VERSION.nil?
+rescue
+  warn 'Jdbc-DSS is only for use with JRuby'
+end
+
+require 'jdbc/dss/version'
+<<<<<<< HEAD
+require 'slf4j-jars'
+=======
+require 'slf4j-api-1.7.25.jar'
+require 'slf4j-simple-1.7.25.jar'
+>>>>>>> 3fa65f2... Use raw slf4j jars
+
+# JDBC Wrapper
+module Jdbc
+  # DSS Wrapper
+  module DSS
+    def self.driver_jar
+      "datawarehouse-jdbc-driver-#{DRIVER_VERSION}.jar"
+    end
+
+    def self.load_driver(method = :load)
+      send method, driver_jar
+    end
+
+    def self.driver_name
+      'com.gooddata.datawarehouse.jdbc.driver.DatawarehouseDriver'
+    end
+
+    if defined?(JRUBY_VERSION) && # enable backwards-compat behavior :
+       (Java::JavaLang::Boolean.get_boolean('jdbc.driver.autoload') ||
+         Java::JavaLang::Boolean.get_boolean('jdbc.dss.autoload'))
+      warn "autoloading JDBC driver on require 'jdbc/dss'" if $VERBOSE
+      load_driver :require
+    end
+  end
+end

data/lib/jdbc/dss/version.rb

@@ -5,6 +5,6 @@ module Jdbc
   # DSS Wrapper
   module DSS
     DRIVER_VERSION = '2.9.0'
-    VERSION = '0.1.15'
+    VERSION = '0.1.16'
   end
 end

data/lib/jdbc/dss/version.rb.orig

@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+# JDBC Wrapper
+module Jdbc
+  # DSS Wrapper
+  module DSS
+    DRIVER_VERSION = '3.1.3'
+<<<<<<< HEAD
+    VERSION = '0.2.3'
+=======
+    VERSION = '0.2.4'
+>>>>>>> 24e9974... Bump version to 0.2.4
+  end
+end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gooddata-dss-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Pavel Kolesnikov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-  name: slf4j-jars
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -144,7 +124,11 @@ files:
 - README.rdoc
 - lib/dss-jdbc-driver-2.9.0.jar
 - lib/jdbc/dss.rb
+- lib/jdbc/dss.rb.orig
 - lib/jdbc/dss/version.rb
+- lib/jdbc/dss/version.rb.orig
+- lib/slf4j-api-1.7.25.jar
+- lib/slf4j-simple-1.7.25.jar
 homepage: http://github.com/gooddata/gooddata-dss-ruby
 licenses: []
 metadata: {}