← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_yacc.yy

  • Committer: Patrick Galbraith
  • Date: 2008-07-28 01:47:41 UTC
  • mto: (212.1.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 217.
  • Revision ID: patg@ishvara-20080728014741-yoasv5trt1ef9rha
Renamed FIELD_TYPE to DRIZZLE_TYPE

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/sql_yacc.yy
1809
1809
        | BIT_SYM
1810
1810
          {
1811
1811
            Lex->length= (char*) "1";
1812
 
            $$=FIELD_TYPE_TINY;
 
1812
            $$=DRIZZLE_TYPE_TINY;
1813
1813
          }
1814
1814
        | BOOL_SYM
1815
1815
          {
1816
1816
            Lex->length=(char*) "1";
1817
 
            $$=FIELD_TYPE_TINY;
 
1817
            $$=DRIZZLE_TYPE_TINY;
1818
1818
          }
1819
1819
        | BOOLEAN_SYM
1820
1820
          {
1821
1821
            Lex->length=(char*) "1";
1822
 
            $$=FIELD_TYPE_TINY;
 
1822
            $$=DRIZZLE_TYPE_TINY;
1823
1823
          }
1824
1824
        | char '(' NUM ')' opt_binary
1825
1825
          {
1826
1826
            Lex->length=$3.str;
1827
 
            $$=FIELD_TYPE_STRING;
 
1827
            $$=DRIZZLE_TYPE_STRING;
1828
1828
          }
1829
1829
        | char opt_binary
1830
1830
          {
1831
1831
            Lex->length=(char*) "1";
1832
 
            $$=FIELD_TYPE_STRING;
 
1832
            $$=DRIZZLE_TYPE_STRING;
1833
1833
          }
1834
1834
        | nchar '(' NUM ')' opt_bin_mod
1835
1835
          {
1836
1836
            Lex->length=$3.str;
1837
 
            $$=FIELD_TYPE_STRING;
 
1837
            $$=DRIZZLE_TYPE_STRING;
1838
1838
            Lex->charset=national_charset_info;
1839
1839
          }
1840
1840
        | nchar opt_bin_mod
1841
1841
          {
1842
1842
            Lex->length=(char*) "1";
1843
 
            $$=FIELD_TYPE_STRING;
 
1843
            $$=DRIZZLE_TYPE_STRING;
1844
1844
            Lex->charset=national_charset_info;
1845
1845
          }
1846
1846
        | BINARY '(' NUM ')'
1847
1847
          {
1848
1848
            Lex->length=$3.str;
1849
1849
            Lex->charset=&my_charset_bin;
1850
 
            $$=FIELD_TYPE_STRING;
 
1850
            $$=DRIZZLE_TYPE_STRING;
1851
1851
          }
1852
1852
        | BINARY
1853
1853
          {
1854
1854
            Lex->length= (char*) "1";
1855
1855
            Lex->charset=&my_charset_bin;
1856
 
            $$=FIELD_TYPE_STRING;
 
1856
            $$=DRIZZLE_TYPE_STRING;
1857
1857
          }
1858
1858
        | varchar '(' NUM ')' opt_binary
1859
1859
          {
1860
1860
            Lex->length=$3.str;
1861
 
            $$= FIELD_TYPE_VARCHAR;
 
1861
            $$= DRIZZLE_TYPE_VARCHAR;
1862
1862
          }
1863
1863
        | nvarchar '(' NUM ')' opt_bin_mod
1864
1864
          {
1865
1865
            Lex->length=$3.str;
1866
 
            $$= FIELD_TYPE_VARCHAR;
 
1866
            $$= DRIZZLE_TYPE_VARCHAR;
1867
1867
            Lex->charset=national_charset_info;
1868
1868
          }
1869
1869
        | VARBINARY '(' NUM ')'
1870
1870
          {
1871
1871
            Lex->length=$3.str;
1872
1872
            Lex->charset=&my_charset_bin;
1873
 
            $$= FIELD_TYPE_VARCHAR;
 
1873
            $$= DRIZZLE_TYPE_VARCHAR;
1874
1874
          }
1875
1875
        | YEAR_SYM opt_len field_options
1876
 
          { $$=FIELD_TYPE_YEAR; }
 
1876
          { $$=DRIZZLE_TYPE_YEAR; }
1877
1877
        | DATE_SYM
1878
 
          { $$=FIELD_TYPE_NEWDATE; }
 
1878
          { $$=DRIZZLE_TYPE_NEWDATE; }
1879
1879
        | TIME_SYM
1880
 
          { $$=FIELD_TYPE_TIME; }
 
1880
          { $$=DRIZZLE_TYPE_TIME; }
1881
1881
        | TIMESTAMP
1882
1882
          {
1883
1883
            /* Unlike other types TIMESTAMP fields are NOT NULL by default */
1884
1884
            Lex->type|= NOT_NULL_FLAG;
1885
 
            $$=FIELD_TYPE_TIMESTAMP;
 
1885
            $$=DRIZZLE_TYPE_TIMESTAMP;
1886
1886
          }
1887
1887
        | DATETIME
1888
 
          { $$=FIELD_TYPE_DATETIME; }
 
1888
          { $$=DRIZZLE_TYPE_DATETIME; }
1889
1889
        | BLOB_SYM opt_len
1890
1890
          {
1891
1891
            Lex->charset=&my_charset_bin;
1892
 
            $$=FIELD_TYPE_BLOB;
 
1892
            $$=DRIZZLE_TYPE_BLOB;
1893
1893
          }
1894
1894
        | TEXT_SYM opt_len opt_binary
1895
 
          { $$=FIELD_TYPE_BLOB; }
 
1895
          { $$=DRIZZLE_TYPE_BLOB; }
1896
1896
        | DECIMAL_SYM float_options field_options
1897
 
          { $$=FIELD_TYPE_NEWDECIMAL;}
 
1897
          { $$=DRIZZLE_TYPE_NEWDECIMAL;}
1898
1898
        | NUMERIC_SYM float_options field_options
1899
 
          { $$=FIELD_TYPE_NEWDECIMAL;}
 
1899
          { $$=DRIZZLE_TYPE_NEWDECIMAL;}
1900
1900
        | FIXED_SYM float_options field_options
1901
 
          { $$=FIELD_TYPE_NEWDECIMAL;}
 
1901
          { $$=DRIZZLE_TYPE_NEWDECIMAL;}
1902
1902
        | ENUM
1903
1903
          {Lex->interval_list.empty();}
1904
1904
          '(' string_list ')' opt_binary
1905
 
          { $$=FIELD_TYPE_ENUM; }
 
1905
          { $$=DRIZZLE_TYPE_ENUM; }
1906
1906
        | SET
1907
1907
          { Lex->interval_list.empty();}
1908
1908
          '(' string_list ')' opt_binary
1909
 
          { $$=FIELD_TYPE_SET; }
 
1909
          { $$=DRIZZLE_TYPE_SET; }
1910
1910
        | SERIAL_SYM
1911
1911
          {
1912
 
            $$=FIELD_TYPE_LONGLONG;
 
1912
            $$=DRIZZLE_TYPE_LONGLONG;
1913
1913
            Lex->type|= (AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNSIGNED_FLAG |
1914
1914
              UNIQUE_FLAG);
1915
1915
          }
1938
1938
        ;
1939
1939
 
1940
1940
int_type:
1941
 
          INT_SYM   { $$=FIELD_TYPE_LONG; }
1942
 
        | TINYINT   { $$=FIELD_TYPE_TINY; }
1943
 
        | SMALLINT  { $$=FIELD_TYPE_SHORT; }
1944
 
        | BIGINT    { $$=FIELD_TYPE_LONGLONG; }
 
1941
          INT_SYM   { $$=DRIZZLE_TYPE_LONG; }
 
1942
        | TINYINT   { $$=DRIZZLE_TYPE_TINY; }
 
1943
        | SMALLINT  { $$=DRIZZLE_TYPE_SHORT; }
 
1944
        | BIGINT    { $$=DRIZZLE_TYPE_LONGLONG; }
1945
1945
        ;
1946
1946
 
1947
1947
real_type:
1948
1948
          REAL
1949
1949
          {
1950
 
            $$= FIELD_TYPE_DOUBLE;
 
1950
            $$= DRIZZLE_TYPE_DOUBLE;
1951
1951
          }
1952
1952
        | DOUBLE_SYM
1953
 
          { $$=FIELD_TYPE_DOUBLE; }
 
1953
          { $$=DRIZZLE_TYPE_DOUBLE; }
1954
1954
        | DOUBLE_SYM PRECISION
1955
 
          { $$=FIELD_TYPE_DOUBLE; }
 
1955
          { $$=DRIZZLE_TYPE_DOUBLE; }
1956
1956
        ;
1957
1957
 
1958
1958
float_options: