jfb 0.4.11 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99d59bd74398a9bbd32fc3bc18410ff58c26b790
-  data.tar.gz: 0c70c6336827ded3757de11872c58a304f5723d1
+  metadata.gz: 3ea104d6054c38a94c66eb26206a27e33fcb74d7
+  data.tar.gz: 9b63e3e408d39bbabae9aafa40f03fbcf32fb54b
 SHA512:
-  metadata.gz: aab394297b10bd1df8e2b00ef00e2cb6a79c40e06172f94cb9cfdf4e828c387ada87ff62bf40686f04993044b8ac5e4d421eec4d40bbb4111ae9902e2c27105b
-  data.tar.gz: ade97f1a625b68ad524f7c240b44e7bab660787aa86058cf686cf1885c8940309f986d309bef7401898d5eff642f097bcec6ae9f07213d0603fcafb2e2f8ee3a
+  metadata.gz: 8cc68910f37c4b4d536cc9d1169ce472fc517cf3c25507b5eb315ab98b326054a410a61fd8f46328bcdc1fc5b69bab25ad3527a4c78ce566e260d745a10404fb
+  data.tar.gz: 152f5fdbb67eb4e8fa856d9d56dfcc629893ce6e71d996c8679ca3e9c0b2152b46bab6b5d56c7e3ccfd6a66091b12daa0851dc295e8453a78e8106ef211470c9

data/lib/jfb/jfb.rb

@@ -1,4 +1,3 @@
-require_relative 'rs'
 require_relative 'jaybird-2.2.12.jar'
 java_import 'java.sql.ResultSet'
 java_import 'java.sql.SQLRecoverableException'
@@ -8,19 +7,27 @@ class JFB
 
 	def initialize(db_url, usr, pwd)
 		Java::JavaClass.for_name("org.firebirdsql.jdbc.FBDriver")
-		fbd = org.firebirdsql.jdbc.FBDriver.new
+		@fbd = org.firebirdsql.jdbc.FBDriver.new
+		@url = db_url
+		@usr = usr
+		@pwd = pwd
 		@closed = true
 		@con = nil
+	end
+
+	def connect()
+		if @closed then
+			@con = nil
 
-		if fbd.acceptsURL("jdbc:firebirdsql:#{db_url}") then
+		if @fbd.acceptsURL("jdbc:firebirdsql:#{@url}") then
 			Java::JavaClass.for_name("java.util.Properties")
 
 			props = java.util.Properties.new
-			props.set_property :user, usr
-			props.set_property :password, pwd
+			props.set_property :user, @usr
+			props.set_property :password, @pwd
 
 			begin
-				@con = fbd.connect("jdbc:firebirdsql:#{db_url}", props)
+				@con = @fbd.connect("jdbc:firebirdsql:#{@url}", props)
 				@con.set_auto_commit false
 				@con.set_holdability ResultSet.HOLD_CURSORS_OVER_COMMIT
 				@closed = false
@@ -33,16 +40,19 @@ class JFB
 		else
 			@con = nil
 			@closed = true
-			puts "Database URI #{db_url} isn't acceptable. 
+			puts "Database URI #{@url} isn't acceptable. 
 			      You don't have to supply the 'jdbc:firebirsql:' part, 
 			      we already do that. Please check your URI."
 		end
+
+			@closed = false
+		end
 	end
 
 	def query(cmd)
 		if not @closed then
 			begin
-				return RS.new(@con.createStatement().executeQuery(cmd))
+				return convert_rs_to_array(@con.createStatement().executeQuery(cmd))
 			rescue Exception => erro
 				puts "Error message while querying:\n#{erro}\nQuery: #{cmd}"
 			end
@@ -87,4 +97,21 @@ class JFB
 			@closed = true
 		end
 	end
+
+	def convert_rs_to_array(rs)
+		res = []
+		k = 0
+
+		while rs.next do
+			cols = rs.metada_data().get_column.count()
+
+			(0..cols - 1).each do |i|
+				res[k][i] = rs.get_string(i)	
+			end
+
+			k = k + 1
+		end
+
+		res
+	end
 end

data/lib/jfb/version.rb

@@ -1,5 +1,5 @@
 module Jfb
-  VERSION = "0.4.11"
+  VERSION = "0.5.0"
 
 #What the numbers mean: rr.ff.hh
 # rr: Major releases and changes in the project;
@@ -56,4 +56,7 @@ module Jfb
 
 #Version 0.4.11
 # Rollback Jaybird version to 2.2.12
+
+#Version 0.5.0
+# Implements standard rs to matrix conversion
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jfb
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.5.0
 platform: ruby
 authors:
 - rCamposCruz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +74,6 @@ files:
 - lib/jfb.rb
 - lib/jfb/jaybird-2.2.12.jar
 - lib/jfb/jfb.rb
-- lib/jfb/rs.rb
 - lib/jfb/version.rb
 homepage: https://github.com/rCamposCruz/jfb
 licenses:

data/lib/jfb/rs.rb

@@ -1,73 +0,0 @@
-require 'java'
-
-class RS
-	def initialize(result_set)
-		@my_rs = result_set
-	end
-
-	def absolute(row)
-		@my_rs.absolute(row)
-	end
-
-	def next
-		return @my_rs.next()
-	end
-
-	def previous
-		return @my_rs.previous()
-	end
-
-	def close
-		if not is_closed?
-			@my_rs.close()
-		end
-	end
-
-	def is_closed?
-		return @my_rs.isClosed()
-	end
-
-	def is_last?
-		return @my_rs.isLast()
-	end
-
-	def is_first? 
-		return @my_rs.isFirst()
-	end
-
-	def before_first
-		return @my_rs.beforeFirst()
-	end
-
-	def after_last
-		return @my_rs.afterLast()
-	end
-
-	def first
-		return @my_rs.first()
-	end
-
-	def last
-		return @my_rs.last()
-	end
-
-	def get_row
-		return @my_rs.getRow()
-	end
-	
-	def get_int(identifier)
-		return @my_rs.getInt(identifier)
-	end
-
-	def get_double(identifier)
-		return @my_rs.getDouble(identifier)
-	end
-
-	def get_string(identifier)
-		return @my_rs.getString(identifier)
-	end
-
-	def get_date(identifier)
-		return @my_rs.getDate(identifier)
-	end
-end