sql_server 0.1.0 → 0.1.1

data/CHANGELOG.textile

@@ -1,3 +1,7 @@
+h1. 0.1.1 - 2010-10-13
+
+* BUGFIX - Commands now set the timeout that was passed into the connection too.
+
 h1. 0.1.0 - 2010-10-04
 
 * Added the ability to execute SQL Server Command Statements.

data/lib/SqlServer.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -wKU
+#!/usr/bin/env ruby
 require 'win32ole'
 
 class << Hash
@@ -10,13 +10,21 @@ end
 class SqlServer
   attr_accessor :connection
 
+  # Creates a Sql Server Connection
+  # * :host => The server name or IP.
+  # * :user_name => SQL user.
+  # * :password => The password for user_name.
+  # * :database => Database to connect to on the host.
+  # * :timeout => The seconds to wait for a query/commant to run.
   def initialize(params = {})
     # Set the connection parameters
     params = { :host => nil, :user_name => nil, :password => nil,
                :database => nil, :timeout => nil }.merge!(params)
+    @timeout = params[:timeout]
     @connection = open(params)
   end
- 
+  
+  # Executes the sepecified query and returns the results in a hash.
   def query(sql)
     # Create an instance of an ADO Recordset
     recordset = WIN32OLE.new('ADODB.Recordset')
@@ -29,13 +37,13 @@ class SqlServer
     fields = []
     data = []
     recordset.Fields.each do |field|
-        fields << field.Name
+      fields << field.Name
     end
     
     begin
       # Move to the first record/row, if any exist
       recordset.MoveFirst
-
+      
       # Grab all records
       data = recordset.GetRows
     rescue Exception => e
@@ -54,6 +62,7 @@ class SqlServer
     return result_set
   end
   
+  # Executes the specfied SQL command.
   def execute_command(sql_statement)
     # Create an instance of an ADO COmmand
     command = WIN32OLE.new('ADODB.Command')
@@ -61,16 +70,18 @@ class SqlServer
     # Execute the SQL statement using the existing ADO connection
     command.ActiveConnection = @connection
     command.CommandText=sql_statement
+    command.CommandTimeout = @timeout unless @timeout.nil?
     command.Execute
   end
-
+  
+  # Closes the connection to the SQL Server.
   def close
     @connection.Close
   end
   
   private
   
-   def open(params)
+  def open(params)
     connection_string =  "Provider=SQLNCLI;"
     connection_string << "Server=#{params[:host]};"
     connection_string << "Uid=#{params[:user_name]};"
@@ -79,7 +90,7 @@ class SqlServer
     
     connection = WIN32OLE.new('ADODB.Connection')
     connection.Open(connection_string)
-    connection.CommandTimeout = params[:timeout] unless params[:timeout].nil?
+    connection.CommandTimeout = @timeout unless @timeout.nil?
     
     return connection
   end

data/lib/SqlServer/version.rb

@@ -1,3 +1,3 @@
 module SqlServer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sql_server
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ed Botzum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -04:00
+date: 2010-10-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency