mdlsql 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54db588948e8891012d0bd13b5b730b06b18dcbb
-  data.tar.gz: a48e8ec0749dd72f240ab76da53a84b0b6e84d9c
+  metadata.gz: d81ad485397fd79dab4de4988239053c78fbe1e7
+  data.tar.gz: a57bf5bd17b329fdab82feef4b375f936ae141c8
 SHA512:
-  metadata.gz: 41a30944eb98f5f5223c4c861f08067e3ec27c530623017271a84de3550ab2c99a63440a7e8275482bae0b9587a18b3358e9f9a34264d6b39ba2f3e3a6cf5a9a
-  data.tar.gz: 602dc6357b9b4e6f277ca0a073bb753eb36ad092715741a29713eb762a24d2e04267217240ee012df18e0b45067b705067ad0eb6182e4b9e200e536a4e8fd10b
+  metadata.gz: de378dd70963af23811c945b7f86059f71cd330e5d921670c1539250039bc36d4ef8800cd26074ef17f60dac813b4662369acf493e9b795d740d0aea567cb844
+  data.tar.gz: 9dc63e28e7b8003f2b9e667e2c4d63163a9919a3e7e2abe62db6672432aee9bf51eec7c121b91188b069c10f8ab0117bc6afe39ff4fef962e9a51ce902a83400

data/lib/mdlsql/sockets/mysql.rb

@@ -38,20 +38,20 @@ class MysqlBuilder < QueryBuilder
 			# Columns (with alias)
 			if cols	
 				cols.each do |key,value|
-					query << " #{value} AS #{key}"
+					query << " #{value} AS #{key}" << ','
 				end
+				query.chop!
 			else
 				query << " *"
 			end
 			
 			# From (with possible alias)
 			if tables
-				query << ' FROM'
+				query << "\nFROM"
 				tables.each do |tab|
-					query << ' ' << tab.to_mysql
+					query << ' ' << tab.to_mysql << ','
 					# query << " #{tab.name}"
 					# query << " AS #{tab.as}" if tab.as
-					query << ","
 				end
 				query.chop!
 
@@ -87,19 +87,29 @@ class MysqlBuilder < QueryBuilder
 
 		def insert(values={})
 			# INSERT INTO table (column1, column2) VALUES (v1c1, v1c2), (v2c1, v2c2)
+			cols = values[:cols]
+			tables = values[:tables]
+			where = values[:where]
+			vals = values[:values]
 
 			query = String.new
 			query = 'INSERT INTO'
 
-			if @from
-				query << " #{@from}"
+			if tables
+				tables.each do |tab|
+					query << ' ' << tab.name.to_s << ','
+					# query << " #{tab.name}"
+					# query << " AS #{tab.as}" if tab.as
+				end
+				query.chop!
+
 			else
-				raise "No table at insert query."
+				raise "No tables at insert query."
 			end
 
-			if @cols && @cols.count > 0
+			if cols && cols.count > 0
 				query << ' ('
-				@cols.each do |key,col|
+				cols.each do |key,col|
 					query << "#{col},"
 				end
 
@@ -108,8 +118,8 @@ class MysqlBuilder < QueryBuilder
 
 			query << ' VALUES'
 
-			if @values
-				@values.each do |row|
+			if vals
+				vals.each do |row|
 					query << ' ('
 					row.each do |val|
 						query << "'#{val}'" << ','
@@ -128,19 +138,26 @@ class MysqlBuilder < QueryBuilder
 		def update(values={})
 			# UPDATE example SET age='22' WHERE age='21'
 
-			table = values[:table]
+			tables = values[:tables]
 			set = values[:values]
 			where = values[:where]
 
 			query = String.new()
 
-			if table
-				query << "UPDATE #{table} "
+			if tables
+				query << "UPDATE"
+				tables.each do |tab|
+					query << ' ' << tab.to_mysql << ','
+					# query << " #{tab.name}"
+					# query << " AS #{tab.as}" if tab.as
+				end
+				query.chop!
+
 			else
 				raise "No table at update query."
 			end
 
-			query << 'SET'
+			query << "\nSET"
 
 			if set && set.count > 0
 				set.each do |key, value|
@@ -151,13 +168,17 @@ class MysqlBuilder < QueryBuilder
 				raise 'Nothing to be set.'
 			end
 
-			query << ' WHERE'
-
-			if where && where.count > 0
-				where.each do |con|
-					query << ' ' << con << ','
+			if where && where.length > 0
+				query << "\nWHERE"
+				# where.each do |dec|
+				# 	query << " #{dec}"
+				# end
+				first = true
+				where.each do |wh|
+					query << " #{wh.concat}" unless first
+					query << " #{wh.cond1} #{wh.op} #{wh.cond2}"
+					first = false
 				end
-				query.chop!
 			else
 				raise 'No WHERE condition in update.'
 			end

data/lib/mdlsql/sqlquery.rb

@@ -77,7 +77,14 @@ module MdlSql
 
 	  def update(table=nil)
 	  	@method = :update
-	  	from table if table
+
+	  	if table.is_a? Symbol
+	  		from table => table
+	  	elsif table.is_a? String
+	  		from table.to_sym => table.to_sym
+	  	elsif table.is_a? Hash
+	  		from table
+	  	end
 			return self
 	  end
 	  
@@ -124,7 +131,7 @@ module MdlSql
 			# table_alias = table_alias if table_alias.is_a? String
 
 			@tables ||= Array.new
-			tables.each do |table,table_alias|
+			tables.each do |table_alias,table|
 				@tables.push Table.new table, table_alias
 			end
 
@@ -149,7 +156,7 @@ module MdlSql
 		# 
 		# @todo Add IN, BETWEEN and LIKE (can be done with actual where).
 		def where(cond1, cond2, opts={})
-			opts[:op] ||= '='
+			opts[:op] ||= :'='
 			opts[:concat] ||= :AND
 
 			# if cond1.is_a? Hash
@@ -177,9 +184,8 @@ module MdlSql
 				:table => table, 
 				:cond1 => cond1, 
 				:cond2 => cond2, 
-				:op => opts[:op], 
-				:type => opts[:type]
 			}
+			vars.merge! opts
 			@join.push Join.new vars
 
 			return self
@@ -245,15 +251,13 @@ module MdlSql
 					:where => @where, 
 					:cols => @cols,
 					:values => @values,
-					:join => @join
-			})
+					:join => @join}
+			)
 
-			if @@debug
-				return query
-			else
-				@result = client.query query
-				return @result
-			end
+			puts query if @@debug
+
+			@result = client.query query
+			return @result
 
 		end
 	end

data/lib/mdlsql/version.rb

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

data/lib/mdlsql/where.rb

@@ -28,6 +28,7 @@ module MdlSql
 			@cond2 = opts[:cond2]
 
 			opts[:op].to_sym if opts[:op].is_a? String
+			opts[:concat].to_sym if opts[:concat].is_a? String
 			@op = opts[:op]
 			@concat = opts[:concat]
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdlsql
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2