← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2011-02-26 21:22:36 UTC
  • mto: This revision was merged to the branch mainline in revision 2204.
  • Revision ID: brian@tangent.org-20110226212236-56pj3bqb6lmhvro3
Clean up the declaraion on attribute.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
741
741
        opt_delete_option varchar
742
742
        opt_outer table_list table_name
743
743
        opt_option opt_place
744
 
        opt_attribute opt_attribute_list attribute
 
744
        opt_attribute
745
745
        opt_attribute_boolean
746
746
        opt_attribute_timestamp
747
747
        opt_attribute_number
1410
1410
 
1411
1411
opt_attribute:
1412
1412
          /* empty */ {}
1413
 
        | opt_attribute_list {}
1414
 
        ;
1415
 
 
1416
 
opt_attribute_list:
1417
 
          opt_attribute_list attribute {}
1418
 
        | attribute
1419
 
        ;
1420
 
 
1421
 
attribute:
1422
 
          opt_attribute_not_null
 
1413
        | opt_attribute opt_attribute_not_null
1423
1414
          { }
1424
 
        | DEFAULT signed_literal
 
1415
        | opt_attribute DEFAULT signed_literal
1425
1416
          {
1426
1417
            statement::AlterTable *statement= (statement::AlterTable *)Lex->statement;
1427
1418
 
1428
 
            statement->default_value=$2;
 
1419
            statement->default_value= $3;
1429
1420
            statement->alter_info.flags.set(ALTER_COLUMN_DEFAULT);
1430
1421
          }
1431
 
        | opt_attribute_index
 
1422
        | opt_attribute opt_attribute_index
1432
1423
          { }
1433
1424
        ;
1434
1425