From 544073486fd1c8aae657987f946493206e828d80 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@bloq.com>
Date: Sat, 5 Jan 2019 13:54:25 -0500
Subject: [PATCH] sql.y: remove no-longer-needed type specifiers inside flags

---
 sql.y | 60 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/sql.y b/sql.y
index 920249a..5d149df 100644
--- a/sql.y
+++ b/sql.y
@@ -759,36 +759,36 @@ opt_csc: /* nil */
    ;
 
 data_type:
-     BIT opt_length { sqlp_data_type(pstate, "BIT"); $$ = 10000 + $2; }
-   | TINYINT opt_length opt_uz { sqlp_data_type(pstate, "TINYINT"); $$ = 10000 + $2; }
-   | SMALLINT opt_length opt_uz { sqlp_data_type(pstate, "SMALLINT"); $$ = 20000 + $2 + $3; }
-   | MEDIUMINT opt_length opt_uz { sqlp_data_type(pstate, "MEDIUMINT"); $$ = 30000 + $2 + $3; }
-   | INT opt_length opt_uz { sqlp_data_type(pstate, "INT"); $$ = 40000 + $2 + $3; }
-   | INTEGER opt_length opt_uz { sqlp_data_type(pstate, "INTEGER"); $$ = 50000 + $2 + $3; }
-   | BIGINT opt_length opt_uz { sqlp_data_type(pstate, "BIGINT"); $$ = 60000 + $2 + $3; }
-   | REAL opt_length opt_uz { sqlp_data_type(pstate, "REAL"); $$ = 70000 + $2 + $3; }
-   | DOUBLE opt_length opt_uz { sqlp_data_type(pstate, "DOUBLE"); $$ = 80000 + $2 + $3; }
-   | FLOAT opt_length opt_uz { sqlp_data_type(pstate, "FLOAT"); $$ = 90000 + $2 + $3; }
-   | DECIMAL opt_length opt_uz { sqlp_data_type(pstate, "DECIMAL"); $$ = 110000 + $2 + $3; }
-   | DATE { sqlp_data_type(pstate, "DATE"); $$ = 100001; }
-   | TIME { sqlp_data_type(pstate, "TIME"); $$ = 100002; }
-   | TIMESTAMP { sqlp_data_type(pstate, "TIMESTAMP"); $$ = 100003; }
-   | DATETIME { sqlp_data_type(pstate, "DATETIME"); $$ = 100004; }
-   | YEAR { sqlp_data_type(pstate, "YEAR"); $$ = 100005; }
-   | CHAR opt_length opt_csc { sqlp_data_type(pstate, "CHAR"); $$ = 120000 + $2; }
-   | VARCHAR '(' INTNUM ')' opt_csc { sqlp_data_type(pstate, "VARCHAR"); $$ = 130000 + $3; }
-   | BINARY opt_length { sqlp_data_type(pstate, "BINARY"); $$ = 140000 + $2; }
-   | VARBINARY '(' INTNUM ')' { sqlp_data_type(pstate, "VARBINARY"); $$ = 150000 + $3; }
-   | TINYBLOB { sqlp_data_type(pstate, "TINYBLOB"); $$ = 160001; }
-   | BLOB { sqlp_data_type(pstate, "BLOB"); $$ = 160002; }
-   | MEDIUMBLOB { sqlp_data_type(pstate, "MEDIUMBLOB"); $$ = 160003; }
-   | LONGBLOB { sqlp_data_type(pstate, "LONGBLOB"); $$ = 160004; }
-   | TINYTEXT opt_binary opt_csc { sqlp_data_type(pstate, "TINYTEXT"); $$ = 170000 + $2; }
-   | TEXT opt_binary opt_csc { sqlp_data_type(pstate, "TEXT"); $$ = 171000 + $2; }
-   | MEDIUMTEXT opt_binary opt_csc { sqlp_data_type(pstate, "MEDIUMTEXT"); $$ = 172000 + $2; }
-   | LONGTEXT opt_binary opt_csc { sqlp_data_type(pstate, "LONGTEXT"); $$ = 173000 + $2; }
-   | ENUM '(' enum_list ')' opt_csc { sqlp_data_type(pstate, "ENUM"); $$ = 200000 + $3; }
-   | SET '(' enum_list ')' opt_csc { sqlp_data_type(pstate, "SET"); $$ = 210000 + $3; }
+     BIT opt_length { sqlp_data_type(pstate, "BIT"); $$ = $2; }
+   | TINYINT opt_length opt_uz { sqlp_data_type(pstate, "TINYINT"); $$ = $2 + $3; }
+   | SMALLINT opt_length opt_uz { sqlp_data_type(pstate, "SMALLINT"); $$ = $2 + $3; }
+   | MEDIUMINT opt_length opt_uz { sqlp_data_type(pstate, "MEDIUMINT"); $$ = $2 + $3; }
+   | INT opt_length opt_uz { sqlp_data_type(pstate, "INT"); $$ = $2 + $3; }
+   | INTEGER opt_length opt_uz { sqlp_data_type(pstate, "INTEGER"); $$ = $2 + $3; }
+   | BIGINT opt_length opt_uz { sqlp_data_type(pstate, "BIGINT"); $$ = $2 + $3; }
+   | REAL opt_length opt_uz { sqlp_data_type(pstate, "REAL"); $$ = $2 + $3; }
+   | DOUBLE opt_length opt_uz { sqlp_data_type(pstate, "DOUBLE"); $$ = $2 + $3; }
+   | FLOAT opt_length opt_uz { sqlp_data_type(pstate, "FLOAT"); $$ = $2 + $3; }
+   | DECIMAL opt_length opt_uz { sqlp_data_type(pstate, "DECIMAL"); $$ = $2 + $3; }
+   | DATE { sqlp_data_type(pstate, "DATE"); $$ = 0; }
+   | TIME { sqlp_data_type(pstate, "TIME"); $$ = 0; }
+   | TIMESTAMP { sqlp_data_type(pstate, "TIMESTAMP"); $$ = 0; }
+   | DATETIME { sqlp_data_type(pstate, "DATETIME"); $$ = 0; }
+   | YEAR { sqlp_data_type(pstate, "YEAR"); $$ = 0; }
+   | CHAR opt_length opt_csc { sqlp_data_type(pstate, "CHAR"); $$ = $2; }
+   | VARCHAR '(' INTNUM ')' opt_csc { sqlp_data_type(pstate, "VARCHAR"); $$ = $3; }
+   | BINARY opt_length { sqlp_data_type(pstate, "BINARY"); $$ = $2; }
+   | VARBINARY '(' INTNUM ')' { sqlp_data_type(pstate, "VARBINARY"); $$ = $3; }
+   | TINYBLOB { sqlp_data_type(pstate, "TINYBLOB"); $$ = 0; }
+   | BLOB { sqlp_data_type(pstate, "BLOB"); $$ = 0; }
+   | MEDIUMBLOB { sqlp_data_type(pstate, "MEDIUMBLOB"); $$ = 0; }
+   | LONGBLOB { sqlp_data_type(pstate, "LONGBLOB"); $$ = 0; }
+   | TINYTEXT opt_binary opt_csc { sqlp_data_type(pstate, "TINYTEXT"); $$ = $2; }
+   | TEXT opt_binary opt_csc { sqlp_data_type(pstate, "TEXT"); $$ = $2; }
+   | MEDIUMTEXT opt_binary opt_csc { sqlp_data_type(pstate, "MEDIUMTEXT"); $$ = $2; }
+   | LONGTEXT opt_binary opt_csc { sqlp_data_type(pstate, "LONGTEXT"); $$ = $2; }
+   | ENUM '(' enum_list ')' opt_csc { sqlp_data_type(pstate, "ENUM"); $$ = $3; }
+   | SET '(' enum_list ')' opt_csc { sqlp_data_type(pstate, "SET"); $$ = $3; }
    ;
 
 enum_list: STRING { sqlp_enum_val(pstate, $1); free($1); $$ = 1; }