mdlsql 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d81ad485397fd79dab4de4988239053c78fbe1e7
-  data.tar.gz: a57bf5bd17b329fdab82feef4b375f936ae141c8
+  metadata.gz: 0a0895818d0c26cdcb9e3e89907bb6a119c55d8f
+  data.tar.gz: f26faadfec22312b7fd95c238f41c8f6e928a92b
 SHA512:
-  metadata.gz: de378dd70963af23811c945b7f86059f71cd330e5d921670c1539250039bc36d4ef8800cd26074ef17f60dac813b4662369acf493e9b795d740d0aea567cb844
-  data.tar.gz: 9dc63e28e7b8003f2b9e667e2c4d63163a9919a3e7e2abe62db6672432aee9bf51eec7c121b91188b069c10f8ab0117bc6afe39ff4fef962e9a51ce902a83400
+  metadata.gz: 751a8f54247f8971ab648fd7a0a4c0496a27b229b1e97034a52671e1aac467a392ed4dd8a4b7ad28a3e89fb9a61aa534fe0cf7346edda03c6b20de149ca41954
+  data.tar.gz: 53bf47dc92a2302cbc1114cecba585ed803a6047e8a76e39d60a9d6db540330ecaf7e0411f0f255519ecfadd6b3a1263c6e3134b5c39f566ff1a0ddfb26aa1d7

data/lib/mdlsql/join.rb

@@ -28,7 +28,7 @@ module MdlSql
 		def initialize opts={}
 			@cond1 = opts[:cond1]
 			@cond2 = opts[:cond2]
-			@table = Table.new opts[:table], opts[:as]
+			@table = Table.new opts[:table]
 			@type = opts[:type]
 
 			opts[:op].to_sym if opts[:op].is_a? String

data/lib/mdlsql/sockets/mysql.rb

@@ -38,7 +38,7 @@ class MysqlBuilder < QueryBuilder
 			# Columns (with alias)
 			if cols	
 				cols.each do |key,value|
-					query << " #{value} AS #{key}" << ','
+					query << " #{key} AS #{value}" << ','
 				end
 				query.chop!
 			else
@@ -179,8 +179,6 @@ class MysqlBuilder < QueryBuilder
 					query << " #{wh.cond1} #{wh.op} #{wh.cond2}"
 					first = false
 				end
-			else
-				raise 'No WHERE condition in update.'
 			end
 
 			return query

data/lib/mdlsql/sqlquery.rb

@@ -131,9 +131,14 @@ module MdlSql
 			# table_alias = table_alias if table_alias.is_a? String
 
 			@tables ||= Array.new
-			tables.each do |table_alias,table|
-				@tables.push Table.new table, table_alias
+			if tables.is_a? Hash
+				tables.each do |table, table_alias|
+					@tables.push Table.new table, table_alias
+				end
+			elsif tables.is_a? Symbol
+				@tables.push Table.new tables, tables
 			end
+				
 
 			# @table = table
 			# @table_alias = table_alias unless table_alias.nil?
@@ -225,41 +230,54 @@ module MdlSql
 		# Exacution command
 	 	# @todo return true/false when inserting/updating 
 		# @todo config for different db
-	  def execute
+	 	def execute opts={}
 			if @@host.nil? || @@username.nil? || @@password.nil? || @@db.nil?
 				raise 'MdlSql has not been correctly configured, please use config() to set host, username, password and db.'
 			end
-	    client = Mysql2::Client.new(
-	    	:host => @host, 
-	    	:username => @@username, 
-	    	:password => @@password, 
-	    	:database => @@db,
-				:symbolize_keys => true
-			)
-			
-			query = String.new
+			unless $client
+			    $client = Mysql2::Client.new(
+			    	:host => @host, 
+			    	:username => @@username, 
+			    	:password => @@password, 
+			    	:database => @@db,
+						:symbolize_keys => true
+				)
+			end
 
-			@@socket ||= :mysql
+			if opts[:query]
+				query = opts[:query]
+			else			
+				query = String.new
 
-			case @@socket
-			when :mysql
-				sock = MysqlBuilder
-			end
+				@@socket ||= :mysql
 
-			query = sock.send("#{@method}", 
-				{:tables => @tables, 
-					:where => @where, 
-					:cols => @cols,
-					:values => @values,
-					:join => @join}
-			)
+				case @@socket
+				when :mysql
+					sock = MysqlBuilder
+				end
+
+				query = sock.send("#{@method}", 
+					{:tables => @tables, 
+						:where => @where, 
+						:cols => @cols,
+						:values => @values,
+						:join => @join}
+				)
+			end
 
-			puts query if @@debug
+			puts "Query: \n#{query}" if @@debug
 
-			@result = client.query query
+			@result = $client.query query
 			return @result
 
 		end
+
+		# Just execute a query.
+		# Compromises compatibility.
+		
+		def query str
+			execute :query => str
+		end
 	end
 end
 

data/lib/mdlsql/table.rb

@@ -19,7 +19,25 @@ module MdlSql
 	class Table
 		attr_accessor :name, :as
 		def initialize name, as=nil
-			name = name.to_sym if name.is_a? String
+
+			if name.is_a? String
+				name = name.to_sym
+			elsif name.is_a? Hash
+				name = name.flatten
+
+				if name[1].is_a? String
+					as = name[1].to_sym
+				else
+					as = name[1]
+				end
+
+				if name[0].is_a? String
+					name = name[0].to_sym
+				else
+					name = name[0]
+				end
+			end
+
 			as = as.to_sym if as.is_a? String
 
 			@name = name

data/lib/mdlsql/version.rb

@@ -1,3 +1,3 @@
 module MdlSql
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/mdlsql.rb

@@ -44,7 +44,7 @@ module MdlSql
 
 	def insert
 		query = SqlQuery.new.insert()
-	  return query
+	  	return query
 	end
 
 	def update(table=nil)
@@ -52,6 +52,10 @@ module MdlSql
 	  return query
 	end
 
+	def query str
+		return SqlQuery.new.query(str)
+	end
+
 	# Calls SqlQuery.config to configurate futures queries. 
 	# @todo Allow many simultaneous configurations. For the moment being, use different config files.
 	# @option values [Symbol]
@@ -59,5 +63,5 @@ module MdlSql
 		SqlQuery.config(values)
 	end
 
-	module_function :config, :select, :insert, :update
+	module_function :config, :select, :insert, :update, :query
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdlsql
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Sikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: A modular query builder to enable a high database compatibility, usage easiness