← 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-01-08 10:35:13 UTC
  • mfrom: (2057.2.9 timestamp)
  • Revision ID: brian@tangent.org-20110108103513-3wuo8tsyajjcxjrg
Merge in fractional seconds to timestamp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1591
1591
            }
1592
1592
            }
1593
1593
          | DATE_SYM
1594
 
          {
1595
 
            $$=DRIZZLE_TYPE_DATE;
 
1594
            {
 
1595
              $$=DRIZZLE_TYPE_DATE;
1596
1596
 
1597
 
            if (Lex->field())
1598
 
              Lex->field()->set_type(message::Table::Field::DATE);
1599
 
          }
 
1597
              if (Lex->field())
 
1598
                Lex->field()->set_type(message::Table::Field::DATE);
 
1599
            }
1600
1600
          | TIME_SYM
1601
 
          {
1602
 
            $$=DRIZZLE_TYPE_TIME;
 
1601
            {
 
1602
              $$=DRIZZLE_TYPE_TIME;
1603
1603
 
1604
 
            if (Lex->field())
1605
 
              Lex->field()->set_type(message::Table::Field::TIME);
1606
 
          }
 
1604
              if (Lex->field())
 
1605
                Lex->field()->set_type(message::Table::Field::TIME);
 
1606
            }
1607
1607
          | TIMESTAMP_SYM
1608
 
          {
1609
 
            $$=DRIZZLE_TYPE_TIMESTAMP;
1610
 
 
1611
 
            if (Lex->field())
1612
 
              Lex->field()->set_type(message::Table::Field::EPOCH);
1613
 
          }
 
1608
            {
 
1609
              $$=DRIZZLE_TYPE_TIMESTAMP;
 
1610
              Lex->length= 0;
 
1611
 
 
1612
              if (Lex->field())
 
1613
                Lex->field()->set_type(message::Table::Field::EPOCH);
 
1614
            }
 
1615
          | TIMESTAMP_SYM '(' NUM ')'
 
1616
            {
 
1617
              $$=DRIZZLE_TYPE_MICROTIME;
 
1618
              Lex->length= $3.str;
 
1619
 
 
1620
              if (Lex->field())
 
1621
                Lex->field()->set_type(message::Table::Field::EPOCH);
 
1622
            }
1614
1623
          | DATETIME_SYM
1615
 
          {
1616
 
            $$=DRIZZLE_TYPE_DATETIME;
 
1624
            {
 
1625
              $$=DRIZZLE_TYPE_DATETIME;
1617
1626
 
1618
 
            if (Lex->field())
1619
 
              Lex->field()->set_type(message::Table::Field::DATETIME);
1620
 
          }
 
1627
              if (Lex->field())
 
1628
                Lex->field()->set_type(message::Table::Field::DATETIME);
 
1629
            }
1621
1630
          | BLOB_SYM
1622
1631
            {
1623
1632
              Lex->charset=&my_charset_bin;
1818
1827
            statement->alter_info.flags.set(ALTER_COLUMN_DEFAULT);
1819
1828
          }
1820
1829
        | ON UPDATE_SYM NOW_SYM optional_braces
1821
 
          { ((statement::AlterTable *)Lex->statement)->on_update_value= new Item_func_now_local(); }
 
1830
          {
 
1831
            ((statement::AlterTable *)Lex->statement)->on_update_value= new Item_func_now_local();
 
1832
          }
1822
1833
        | AUTO_INC
1823
1834
          {
1824
1835
            Lex->type|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG;