each_sql 0.3.0 → 0.3.1

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+### 0.3.1 / 2012/03/15
+* Bug fix: `begin transaction`
+* `EachSQL#clear`
+
 ### 0.3.0 / 2012/03/10
 * Internal implementation revised.
  * At first, I thought this would be trivial, 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/each_sql/each_sql.rb

@@ -5,12 +5,13 @@ class EachSQL
   include Enumerable
 
   # @param[Symbol] type RDBMS type: :default|:mysql|:oracle|:postgres
-  def initialize type
+  # @param[String] delimiter Script delimiter.
+  def initialize type, delimiter = ';'
     @type   = type
     @data   = ''
     @sqls   = []
 
-    self.delimiter = ';'
+    self.delimiter = delimiter
   end
 
   # @param[String] delim SQL delimiter
@@ -35,6 +36,13 @@ class EachSQL
     self
   end
 
+  # Clears the buffer
+  # @return [EachSQL]
+  def clear
+    @data = ''
+    self
+  end
+
   # Parses current buffer and returns the result in Hash.
   # :sqls is an Array of processed executable SQL blocks,
   # :leftover is the unparsed trailing data

data/lib/each_sql/parser/sql.citrus.erb

@@ -23,7 +23,7 @@ grammar EachSQL::Parser::Default<%= suffix %>
   end
 
   rule begin_block
-    /\bbegin\b/i
+    /\bbegin\b/i !(empty+ /\btransaction\b/i)
   end
 
   rule end_block

data/test/test_each_sql.rb

@@ -5,10 +5,30 @@ require 'helper'
 require 'yaml'
 
 class TestEachSql < Test::Unit::TestCase
-  def _test_empty
+  def test_each_sql
+    esql = EachSQL.new(:default)
+    esql << "select"
+    result = esql.shift
+    assert_equal 0, result[:sqls].length
+    assert_equal 'select', result[:leftover]
+
+    esql << " * from table1; select * from table2;"
+    result = esql.shift
+    assert_equal ['select * from table1', 'select * from table2'], result[:sqls]
+    assert_equal nil, result[:leftover]
+
+    esql << "select * from table3;"
+    assert_equal esql, esql.clear
+    result = esql.shift
+    assert_equal 0, result[:sqls].length
+    assert_equal nil, result[:leftover]
+  end
+
+  # Acceptance tests
+  # ================
+  def test_empty
 		[nil, "", " \n" * 10].each do |input|
 			EachSQL(input).each do |sql|
-        p sql
 				assert false, 'Should not enumerate'
 			end
 
@@ -20,7 +40,7 @@ class TestEachSql < Test::Unit::TestCase
 		end
   end
 
-  def _test_parser_cache
+  def test_parser_cache
     [:default, :mysql, :oracle, :postgres].each do |typ|
       %w[';', '$$', '//'].each do |delim|
         arr = 
@@ -71,27 +91,4 @@ class TestEachSql < Test::Unit::TestCase
       assert_equal EachSQL(script, typ).to_a, EachSQL(script, typ).map { |e| e }
     end
 	end
-	
-	# def test_oracle
-	# 	EachSQL(@oracle_script, :oracle).each_with_index do |sql,idx|
-	# 		puts sql
-	# 		puts '-' * 40
-	# 		assert_equal @oracle[idx], sql
-	# 	end
-	# end
-
-	# def test_mysql
-	# 	EachSQL(@mysql_script, :mysql).each_with_index do |sql,idx|
-	# 		puts sql
-	# 		puts '-' * 40
-	# 		assert_equal @mysql[idx], sql
-	# 	end
-	# end
-
-	# def _test_postgres
-	# 	EachSQL(File.read(File.dirname(__FILE__) + '/postgres.sql'), :postgres).each_with_index do |sql,idx|
-	# 		puts sql
-	# 		puts '-' * 40
-	# 	end
-	# end
 end

data/test/yml/common.yml

@@ -293,7 +293,9 @@ all: |
   select 
     begin , begin.* from begin;
   select b `begin` from dual;
+  begin transaction;
   commit;
+  start transaction;
   rollback;
   select b "begin" from dual
 
@@ -596,6 +598,8 @@ each:
   select 
     begin , begin.* from begin
 - select b `begin` from dual
+- begin transaction
 - commit
+- start transaction
 - rollback
 - select b "begin" from dual

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: each_sql
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1680732700145923477
+      hash: 4467039074985070644
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: