Tests for the improved SQL scanner.

1 files changed, 10 insertions, 10 deletions

diff --git a/test/scanners/sql/create_tables.expected.raydebug b/test/scanners/sql/create_tables.expected.raydebug
index e93a8a1..a4b7f47 100644
--- a/test/scanners/sql/create_tables.expected.raydebug
+++ b/test/scanners/sql/create_tables.expected.raydebug
@@ -15,18 +15,18 @@ comment(--You should have received a copy of the GNU General Public License)
 comment(--along with this program.  If not, see <http://www.gnu.org/licenses/>.)
 
 comment(-- Comment: Drop table)
-reserved(DROP) reserved(TABLE) reserved(IF) reserved(EXISTS) string<delimiter(`)content(general_lookups)delimiter(`)>operator(;)
+class(DROP) type(TABLE) reserved(IF) reserved(EXISTS) string<delimiter(`)content(general_lookups)delimiter(`)>operator(;)
 
 comment(-- Create table)
-reserved(CREATE) reserved(TABLE) string<delimiter(`)content(general_lookups)delimiter(`)> operator(()
+class(CREATE) type(TABLE) string<delimiter(`)content(general_lookups)delimiter(`)> operator(()
   string<delimiter(`)content(name)delimiter(`)> pre_type(varchar)operator(()integer(255)operator(\)) directive(default) pre_constant(NULL)
 operator(\)) reserved(ENGINE)operator(=)ident(InnoDB) directive(DEFAULT) directive(CHARSET)operator(=)ident(latin1)operator(;)
 
 comment(-- Drop table again)
-reserved(DROP) reserved(TABLE) reserved(IF) reserved(EXISTS) ident(customer)operator(;)
+class(DROP) type(TABLE) reserved(IF) reserved(EXISTS) ident(customer)operator(;)
 
 comment(-- Create customers)
-reserved(CREATE) reserved(TABLE) ident(customer) operator(()
+class(CREATE) type(TABLE) ident(customer) operator(()
    ident(first_name) pre_type(char)operator(()integer(50)operator(\))operator(,)
    ident(last_name) pre_type(char)operator(()integer(50)operator(\))operator(,)
    ident(address) pre_type(char)operator(()integer(50)operator(\))operator(,)
@@ -38,7 +38,7 @@ reserved(CREATE) reserved(TABLE) ident(customer) operator(()
 operator(\))
 
 comment(-- Create business)
-reserved(CREATE) reserved(TABLE) ident(business) operator(()
+class(CREATE) type(TABLE) ident(business) operator(()
    ident(compant_name) pre_type(char)operator(()integer(50)operator(\))operator(,)
    ident(address) pre_type(char)operator(()integer(50)operator(\)) directive(default) string<delimiter(')content(Address Unknown)delimiter(')>operator(,) comment(-- Oohh, defaults..)
    ident(city) pre_type(char)operator(()integer(50)operator(\)) directive(default) string<delimiter(')content(Adelaide)delimiter(')>operator(,)
@@ -47,9 +47,9 @@ operator(\))
 
 comment(-- Some random table)
 
-reserved(DROP) reserved(TABLE) reserved(IF) reserved(EXISTS) ident(customer_statuses)operator(;)
+class(DROP) type(TABLE) reserved(IF) reserved(EXISTS) ident(customer_statuses)operator(;)
 
-reserved(CREATE) reserved(TABLE) string<delimiter(`)content(customer_statuses)delimiter(`)> operator(()
+class(CREATE) type(TABLE) string<delimiter(`)content(customer_statuses)delimiter(`)> operator(()
    comment(-- Auto incrementing IDs)
   string<delimiter(`)content(id)delimiter(`)> pre_type(smallint)operator(()integer(6)operator(\)) pre_type(unsigned) reserved(NOT) pre_constant(NULL) directive(auto_increment)operator(,)
   string<delimiter(`)content(customer_id)delimiter(`)> pre_type(int)operator(()integer(10)operator(\)) pre_type(unsigned) reserved(NOT) pre_constant(NULL) directive(default) string<delimiter(')content(0)delimiter(')>operator(,)
@@ -61,12 +61,12 @@ reserved(CREATE) reserved(TABLE) string<delimiter(`)content(customer_statuses)de
 operator(\)) reserved(ENGINE)operator(=)ident(InnoDB) directive(DEFAULT) directive(CHARSET)operator(=)ident(latin1)operator(;)
 
 comment(-- Try creating an index.)
-reserved(CREATE) reserved(INDEX) ident(customer_status_status_id) reserved(ON) ident(customer_statuses) operator(()ident(status_id)operator(\))
+class(CREATE) type(INDEX) ident(customer_status_status_id) reserved(ON) ident(customer_statuses) operator(()ident(status_id)operator(\))
 
 comment(/* Now lets try and make a really big table */)
 
-reserved(DROP) reserved(TABLE) reserved(IF) reserved(EXISTS) string<delimiter(`)content(legacy_clients)delimiter(`)>operator(;)
-reserved(CREATE) reserved(TABLE) string<delimiter(`)content(legacy_clients)delimiter(`)> operator(()
+class(DROP) type(TABLE) reserved(IF) reserved(EXISTS) string<delimiter(`)content(legacy_clients)delimiter(`)>operator(;)
+class(CREATE) type(TABLE) string<delimiter(`)content(legacy_clients)delimiter(`)> operator(()
   string<delimiter(`)content(id)delimiter(`)> pre_type(int)operator(()integer(10)operator(\)) pre_type(unsigned) reserved(NOT) pre_constant(NULL) directive(auto_increment)operator(,)
   string<delimiter(`)content(client_code)delimiter(`)> pre_type(varchar)operator(()integer(15)operator(\)) directive(default) pre_constant(NULL)operator(,)
   string<delimiter(`)content(first_name)delimiter(`)> pre_type(varchar)operator(()integer(20)operator(\)) reserved(NOT) pre_constant(NULL) directive(default) string<delimiter(')delimiter(')>operator(,)