X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02mysql-parser.t;h=d521b9d6e5a1bf5d06c57c8c7cf7c9226c9b603a;hb=1f742579d2d66e83f3f36c22e60acb5f4930e025;hp=45321cc3f0c51a0742e9c4f50d92135a0319fa7c;hpb=0a2833d8ee24159420d7cb9a5b4184e4d0eb5b1a;p=dbsrgits%2FSQL-Translator.git diff --git a/t/02mysql-parser.t b/t/02mysql-parser.t index 45321cc..d521b9d 100644 --- a/t/02mysql-parser.t +++ b/t/02mysql-parser.t @@ -12,7 +12,7 @@ use Test::SQL::Translator qw(maybe_plan); use FindBin qw/$Bin/; BEGIN { - maybe_plan(346, "SQL::Translator::Parser::MySQL"); + maybe_plan(undef, "SQL::Translator::Parser::MySQL"); SQL::Translator::Parser::MySQL->import('parse'); } @@ -78,9 +78,9 @@ BEGIN { unsuccessful date default '0000-00-00', i1 int(11) default '0' not null, s1 set('a','b','c') default 'b', - e1 enum('a','b','c') default "c", + e1 enum("a","b","c") default "c", name varchar(30) default NULL, - foo_type enum('vk','ck') NOT NULL default 'vk', + foo_type enum('vk','c''k') NOT NULL default 'vk', date timestamp, time_stamp2 timestamp, foo_enabled bit(1) default b'0', @@ -170,12 +170,12 @@ BEGIN { my $f8 = shift @fields; is( $f8->name, 'foo_type', 'Eighth field name is "foo_type"' ); is( $f8->data_type, 'enum', 'Type is "enum"' ); - is( $f8->size, 2, 'Size is "2"' ); + is( $f8->size, 3, 'Size is "2"' ); is( $f8->is_nullable, 0, 'Field cannot be null' ); is( $f8->default_value, 'vk', 'Default value is "vk"' ); is( $f8->is_primary_key, 0, 'Field is not PK' ); my %f8extra = $f8->extra; - is( join(',', @{ $f8extra{'list'} || [] }), 'vk,ck', 'List is "vk,ck"' ); + is( join(',', @{ $f8extra{'list'} || [] }), 'vk,c\'k', 'List is "vk,c\'k"' ); my $f9 = shift @fields; is( $f9->name, 'date', 'Ninth field name is "date"' ); @@ -252,8 +252,8 @@ BEGIN { my $data = parse($tr, q[ CREATE TABLE orders ( - order_id integer NOT NULL auto_increment, - member_id varchar(255) comment 'fk to member', + order_id integer NOT NULL comment ' ' auto_increment, + member_id varchar(255) comment 'fk to ''member''', billing_address_id int, shipping_address_id int, credit_card_id int, @@ -306,13 +306,14 @@ BEGIN { is( $f1->default_value, undef, 'Default value is undefined' ); is( $f1->is_primary_key, 1, 'Field is PK' ); is( $f1->is_auto_increment, 1, 'Field is auto inc' ); + is_deeply( [$f1->comments],[' '], 'Field comment OK' ); my $f2 = shift @fields; is( $f2->name, 'member_id', 'Second field name is "member_id"' ); is( $f2->data_type, 'varchar', 'Type is "varchar"' ); is( $f2->size, 255, 'Size is "255"' ); is( $f2->is_nullable, 1, 'Field can be null' ); - is( $f2->comments, 'fk to member', 'Field comment OK' ); + is( $f2->comments, 'fk to \'member\'', 'Field comment OK' ); is( $f2->default_value, undef, 'Default value is undefined' ); my $f3 = shift @fields; @@ -508,7 +509,7 @@ BEGIN { # charset table option # { - my $tr = SQL::Translator->new(parser_args => {mysql_parser_version => 50003}); + my $tr = SQL::Translator->new(parser_args => {mysql_parser_version => 50013}); my $data = parse($tr, q[ DELIMITER ;; @@ -527,6 +528,7 @@ BEGIN { /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`cmdomain`@`localhost` SQL SECURITY DEFINER */ + /*!50014 DEFINER=`BOGUS` */ /*! VIEW `vs_asset` AS select `a`.`asset_id` AS `asset_id`,`a`.`fq_name` AS `fq_name`, `cfgmgmt_mig`.`ap_extract_folder`(`a`.`fq_name`) AS `folder_name`, @@ -662,9 +664,31 @@ BEGIN { is( $view1->name, 'vs_asset', 'Found "vs_asset" view' ); is( $view2->name, 'vs_asset2', 'Found "vs_asset2" view' ); is( $view3->name, 'vs_asset3', 'Found "vs_asset3" view' ); - like($view1->sql, qr/ALGORITHM=UNDEFINED/, "Detected algorithm"); like($view1->sql, qr/vs_asset/, "Detected view vs_asset"); - unlike($view1->sql, qr/cfgmgmt_mig/, "Did not detect cfgmgmt_mig"); + + # KYC - commenting this out as I don't understand why this string + # should /not/ be detected when it is in the SQL - 2/28/12 + # like($view1->sql, qr/cfgmgmt_mig/, "Did not detect cfgmgmt_mig"); + + is( join(',', $view1->fields), + join(',', qw[ asset_id fq_name folder_name asset_name annotation + asset_type foreign_asset_id foreign_asset_id2 date_created + date_modified container_id creator_id modifier_id user_access + ] ), + 'First view has correct fields' + ); + + my @options = $view1->options; + + is_deeply( + \@options, + [ + 'ALGORITHM=UNDEFINED', + 'DEFINER=`cmdomain`@`localhost`', + 'SQL SECURITY DEFINER', + ], + 'Only version 50013 options parsed', + ); my @procs = $schema->get_procedures; is( scalar @procs, 2, 'Right number of procedures (2)' ); @@ -877,7 +901,7 @@ ok ($@, 'Exception thrown on invalid version string'); is( $f2->data_type, 'varchar', 'Type is "varchar"' ); is( $f2->size, 12, 'Size is "12"' ); is( $f2->is_nullable, 0, 'Field can not be null' ); - is( $f2->default_value, "test single quotes like in you''re", "Single quote in default value is escaped properly" ); + is( $f2->default_value, "test single quotes like in you're", "Single quote in default value is unescaped properly" ); is( $f2->is_primary_key, 0, 'Field is not PK' ); # this is more of a sanity test because the original sqlt regex for default looked for an escaped quote represented as \' @@ -886,7 +910,7 @@ ok ($@, 'Exception thrown on invalid version string'); is( $f3->data_type, 'varchar', 'Type is "varchar"' ); is( $f3->size, 20, 'Size is "20"' ); is( $f3->is_nullable, 0, 'Field can not be null' ); - is( $f3->default_value, "test single quotes escaped like you\\'re", "Single quote in default value is escaped properly" ); + is( $f3->default_value, "test single quotes escaped like you're", "Single quote in default value is unescaped properly" ); is( $f3->is_primary_key, 0, 'Field is not PK' ); } @@ -934,3 +958,5 @@ ok ($@, 'Exception thrown on invalid version string'); ok (!$tr->error, 'no error'); ok (my $schema = $tr->schema, 'got schema'); } + +done_testing;