From cda3ae99879f36abd9cf96fc10f858ad56688190 Mon Sep 17 00:00:00 2001 From: Matthew Musgrove Date: Thu, 13 Jul 2017 11:50:59 -0500 Subject: [PATCH 1/3] issue-78 Change some of the C-style or slash-asterisk comments to SQL92 comments (double hyphen) --- t/data/sybase/create.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/data/sybase/create.sql b/t/data/sybase/create.sql index 4ae380b46..7b32468fa 100644 --- a/t/data/sybase/create.sql +++ b/t/data/sybase/create.sql @@ -1,5 +1,5 @@ -/* Script generated by dbschema.pl(2.4.2) on Mon Aug 18 14:15:25 2003. */ -/* Script extracted on a solaris system. */ +-- Script generated by dbschema.pl(2.4.2) on Mon Aug 18 14:15:25 2003. +-- Script extracted on a solaris system. use master go @@ -2156,7 +2156,7 @@ end set transaction isolation level 1 -/* Check to see if this language is in Syslanguages. */ +-- Check to see if this language is in Syslanguages. if exists (select * from master.dbo.syslanguages where name = @name) From 0acfb9248c0963049ab354a272f9d717fbcb80a1 Mon Sep 17 00:00:00 2001 From: Matthew Musgrove Date: Thu, 13 Jul 2017 11:52:27 -0500 Subject: [PATCH 2/3] issue-78 Update the comments grammar to allow SQL92 comments. --- lib/SQL/Translator/Parser/Sybase.pm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/SQL/Translator/Parser/Sybase.pm b/lib/SQL/Translator/Parser/Sybase.pm index e3fd94333..4c303a4a4 100644 --- a/lib/SQL/Translator/Parser/Sybase.pm +++ b/lib/SQL/Translator/Parser/Sybase.pm @@ -81,6 +81,15 @@ exec : exec_statement(s) GO exec_statement : /exec/i /[^\n]+/ +comment : /^\s*(?:#|-{2}).*\n/ + { + my $comment = $item[1]; + $comment =~ s/^\s*(#|--)\s*//; + $comment =~ s/\s*$//; + $return = $comment; + push @table_comments, $comment; + } + comment : comment_start comment_middle comment_end { my $comment = $item[2]; From 7b29b3c561491b7760eeb1684ff351e68e3478b4 Mon Sep 17 00:00:00 2001 From: Matthew Musgrove Date: Thu, 13 Jul 2017 13:43:40 -0500 Subject: [PATCH 3/3] Fix comment grammar --- lib/SQL/Translator/Parser/Sybase.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/SQL/Translator/Parser/Sybase.pm b/lib/SQL/Translator/Parser/Sybase.pm index 4c303a4a4..548740a78 100644 --- a/lib/SQL/Translator/Parser/Sybase.pm +++ b/lib/SQL/Translator/Parser/Sybase.pm @@ -81,10 +81,10 @@ exec : exec_statement(s) GO exec_statement : /exec/i /[^\n]+/ -comment : /^\s*(?:#|-{2}).*\n/ +comment : /^\s*--.*\n/ { my $comment = $item[1]; - $comment =~ s/^\s*(#|--)\s*//; + $comment =~ s/^\s*--\s*//; $comment =~ s/\s*$//; $return = $comment; push @table_comments, $comment;