MYSQLSafe 0.1.3 → 0.1.4

data/lib/MYSQLSafe/base.rb

@@ -15,39 +15,50 @@ module MYSQLSafe
 			
 			
 			sql = esc_enc_string(raw_sql)
-			if options["host"] && options["database"] && options["user"] && options["password"]
-				begin
-					@cxtn = Mysql.new(options["host"], options["user"], options["password"], options["database"])
-					table_names = get_table_names
-					table_match = match_name(table_names, sql)
-					
-					if table_match
-						column_names = get_column_names(table_match)
-						column_match = match_name(column_names, sql)
-						column_match = [] if !(sql.to_s.downcase.include?('where'))
+			begin
+				case
+					when options["host"], options["user"], options["password"], options["database"]
+						@cxtn = Mysql.new(options["host"], options["user"], options["password"], options["database"])
+					when options["host"], options["user"], options["password"]
+						@cxtn = Mysql.new(options["host"], options["user"], options["password"])
+					when options["host"], options["user"]
+						@cxtn = Mysql.new(options["host"], options["user"])
 					else
-						raise 'MYSQLSafe error: no valid table name could be found in your SQL statement'
-					end
-					
-					if column_match
-						ticked_sql = tick_sql(sql, table_match, column_match)
-					else
-						raise 'MYSQLSafe error: no valid column name(s) could be found in your SQL statement'
-					end
-					
-					mysql_object = @cxtn.query(ticked_sql)
-					mysql_object.each { |row| @mysql_array.push(row) }
-				rescue Mysql::Error => msqle
-					puts "Error! #{msqle}, #{@mysql_array}"
-					@mysql_array.push(["MYSQL Error: #{msqle}"])
-				ensure
-					@cxtn.close if @cxtn
+						raise "MYSQLSafe error: In order to connect to MYSQL you must at least set the host and username. So far you have included #{options}."
 				end
-			else
-				raise "MYSQLSafe error: Host, Database, User and Password must be set to run a query. You included #{options}"
+				
+				table_names = get_table_names
+				table_match = match_name(table_names, sql)
+				
+				if table_match
+					column_names = get_column_names(table_match)
+					column_match = match_name(column_names, sql)
+					column_match = [] if !(sql.to_s.downcase.include?('where'))
+				else
+					raise 'MYSQLSafe error: no valid table name could be found in your SQL statement'
+				end
+				
+				if column_match
+					ticked_sql = tick_sql(sql, table_match, column_match)
+				else
+					raise 'MYSQLSafe error: no valid column name(s) could be found in your SQL statement'
+				end
+				
+				mysql_object = @cxtn.query(ticked_sql)
+				mysql_object.each { |row| @mysql_array.push(row) } if mysql_object
+				unless @mysql_array.size > 0
+					@mysql_array = ["Success, with 'nil' result"] 
+				end
+			rescue Mysql::Error => msqle
+				puts "Error! #{msqle}, #{@mysql_array}"
+				@mysql_array.push(["MYSQL Error: #{msqle}"])
+			ensure
+				@cxtn.close if @cxtn
 			end
+			
 			return @mysql_array
-		end
+				
+			end
 
 		private
 		def tick_sql(sql, table_array, column_array)

data/lib/MYSQLSafe/version.rb

@@ -1,3 +1,3 @@
 module MYSQLSafe
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/lib/MYSQLSafe/base_test.rb

@@ -8,7 +8,7 @@ describe MYSQLSafe::Base do
 		@obj = MYSQLSafe::Base.new
 	end
 	
-  it "should allow enconding to be set and read" do
+  it "should allow encoding to be set and read" do
 		encoding_name = 'utf-8'
 		@obj.encoding = encoding_name
 		@obj.encoding.must_equal encoding_name
@@ -24,7 +24,7 @@ describe MYSQLSafe::Base do
 		@obj.host.must_equal hostname
 	end
   it "should allow database to be set and read" do
-		database_name = 'test'
+		database_name = 'test_mysql'
 		@obj.database = database_name
 		@obj.database.must_equal database_name
 	end
@@ -62,4 +62,11 @@ describe MYSQLSafe::Base do
 		success.to_s.wont_include "MYSQL Error"
 		success.must_be_instance_of Array
 	end
+	
+  it "should allow insert into syntax" do
+		@obj = help.set_variables(@obj)
+		success = @obj.connect_safe("INSERT INTO `performance_test` SELECT * FROM `performance_test` WHERE `test_int` = 1 LIMIT 1")
+		success.to_s.wont_include "MYSQL Error"
+		success.must_be_instance_of Array
+	end
 end

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require File.expand_path('../../lib/MYSQLSafe.rb', __FILE__)
 
 class TestHelpers
 	attr_accessor :encoding_name, :hostname_name, :user_name, :database_name, :password_name
+	
 	def set_encoding(obj)
 		@encoding_name = 'utf-8'
 		obj.encoding = @encoding_name
@@ -20,7 +21,7 @@ class TestHelpers
 		return obj
 	end
 	def set_database(obj)
-		@database_name = 'test'
+		@database_name = 'test_mysql'
 		obj.database = @database_name
 		return obj
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MYSQLSafe
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler