MYSQLSafe 0.0.8 → 0.0.9

data/lib/MYSQLSafe/base.rb

@@ -3,7 +3,7 @@ require 'mysql'
 module MYSQLSafe
 	class Base
 		attr_accessor :host, :database, :user, :encoding, :password
-		
+
 		def connect_safe(raw_sql)
 			@mysql_array = []
 			@encoding ||= 'utf-8'
@@ -22,8 +22,9 @@ module MYSQLSafe
 					table_match = match_name(table_names, sql)
 					
 					if table_match
-						column_names = get_column_names(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
@@ -34,9 +35,8 @@ module MYSQLSafe
 						raise 'MYSQLSafe error: no valid column name(s) could be found in your SQL statement'
 					end
 					
-					mysql_object = cxtn.query(ticked_sql)
+					mysql_object = @cxtn.query(ticked_sql)
 					mysql_object.each { |row| @mysql_array.push(row) }
-					puts "After push: #{@mysql_array}"
 				rescue Mysql::Error => msqle
 					puts "Error! #{msqle}, #{@mysql_array}"
 					@mysql_array.push(["MYSQL Error: #{msqle}"])
@@ -46,10 +46,9 @@ module MYSQLSafe
 			else
 				raise "MYSQLSafe error: Host, Database, User and Password must be set to run a query. You included #{options}"
 			end
-			puts "@mysql_array is #{@mysql_array} a #{@mysql_array.class}"
 			return @mysql_array
 		end
-		
+
 		private
 		def tick_sql(sql, table_array, column_array)
 			ticked_sql = sql.delete("`")
@@ -62,24 +61,26 @@ module MYSQLSafe
 			
 			return ticked_sql
 		end
-		
-		def get_column_names(table_name)
-			column_names_sql = "SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`='#{@database}' AND `TABLE_NAME`='#{table_name}';"
-			column_names_results_sql = query_safe(column_names_sql)
-			
+
+		def get_column_names(table_names)
 			column_names = []
-			column_names_results_sql.each do |name|
-				column_names.push(name)
+			table_names.each do |table_name|
+				column_names_sql = "SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`='#{@database}' AND `TABLE_NAME`='#{table_name}';"
+				column_names_results_sql = @cxtn.query(column_names_sql)
+			
+				column_names_results_sql.each do |name|
+					column_names.push(name)
+				end
 			end
 			
 			return column_names
 		end
-		
+
 		def match_name(name_array, sql)
 			match = []
 			
 			name_array.each do |name|
-				match.push(name) if sql.to_s.include?("#{name}=") || sql.to_s[/#{name}\s+=/] || sql.to_s[/#{name}`\s+=/]
+				match.push(name) if sql.to_s.include?("#{name}")
 			end
 			
 			if match.size > 0
@@ -88,34 +89,34 @@ module MYSQLSafe
 				return false
 			end
 		end
-		
+			
 		def query_safe(dangerous_sql)
 			@cxtn.query(Mysql.escape_string(dangerous_sql))
 		end
-		
+
 		def get_table_names
 			table_names_sql = "SHOW TABLES FROM `#{@database}`;"
 			table_names_results_sql = query_safe(table_names_sql)
 			
 			table_names = []
 			table_names_results_sql.each do |name|
-				table_names.push(name)
+				table_names.push(name[0])
 			end
 			
 			return table_names
 		end
-		
+
 		def esc_enc_string(string)
 			return esc_string(enc_string(string.to_s))
 		end
-		
+
 		def enc_string(string)
 			return string.encode("#{@encoding}", "#{@encoding}", :invalid => :replace)
 		end
-		
+
 		def esc_string(string)
 			return Mysql.escape_string(string)
 		end
-		
+
 	end
 end

data/lib/MYSQLSafe/version.rb

@@ -1,3 +1,3 @@
 module MYSQLSafe
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/lib/MYSQLSafe/base_test.rb

@@ -45,7 +45,7 @@ describe MYSQLSafe::Base do
 		password_key = ENV['MYSQLPASSWORD'] || "password"
 		@obj.password = password_key
 		
-		success = @obj.connect_safe("SELECT * FROM test LIMIT 1")
+		success = @obj.connect_safe("SELECT * FROM performance_test LIMIT 1")
 		success.must_be_instance_of Array
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MYSQLSafe
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: