Merge lp:~nahiljain/to-drizzle/parse_create_table into lp:to-drizzle

[neh]

1)parser for create table and create schema.
2)test cases for create schema.

[Jay Pipes (jaypipes)]

Looks good so far. I'll merge into trunk.

Remember your code style consistency for next time. :)

review: Approve

=== modified file 'movetodrizzle/helpers/lexer.py'
--- movetodrizzle/helpers/lexer.py	2010-06-25 17:33:48 +0000
+++ movetodrizzle/helpers/lexer.py	2010-06-28 17:03:27 +0000
@@ -46,7 +46,8 @@
   'text' : 'TEXT',
   'mediumtext' : 'MEDIUMTEXT',
   'longtext' : 'LONGTEXT',
-  'enum' : 'ENUM'
+  'enum' : 'ENUM',
+  'null' : 'NULL'
 
 }
 
 
=== modified file 'movetodrizzle/helpers/parser.py'
--- movetodrizzle/helpers/parser.py	2010-06-25 17:33:48 +0000
+++ movetodrizzle/helpers/parser.py	2010-06-28 17:03:27 +0000
@@ -21,14 +21,15 @@
     return "CreateSchemaStatement(schema=%s) (character_set=%s) (collate=%s) (if_not_exists=%s)" % (self.schema_name, self.character_set,self.collate_name,self.if_not_exists)
 
 class column():
-  def __init__(self,name,type):
+  def __init__(self,name,type,not_null):
     self.name=name;
     self.type=type;
+    self.not_null=not_null;
   def __repr__(self):
-    return "Column(col_name=%s) (col_definition=%s)" % (self.name,self.type)
+    return "Column(col_name=%s) (col_definition=%s) (not_null=%s)" % (self.name,self.type,self.not_null)
 
 class CreateTableStatement(SqlStatement):
-  def __init__(self, table_name, list_columns,temporary= False, if_not_exists= False):
+  def __init__(self, table_name, list_columns,if_not_exists= False,temporary = False):
     self.table_name= table_name;
     self.temporary= temporary;
     self.if_not_exists=if_not_exists;
@@ -36,7 +37,7 @@
   def add_column(col):
     self.columns.append(col);
   def __repr__(self):
-    return "CreateTableStatement(table=%s) (columns=%s)" % (self.table_name,str(self.columns))
+    return "CreateTableStatement(table=%s) (if_not_exists=%s) (columns=%s)" % (self.table_name,self.if_not_exists,str(self.columns))
 
 # Begin grammar rules
 def p_statement_list(p):
@@ -56,8 +57,8 @@
   p[0]=p[1]
 
 def p_create_table_simple(p):
-  '''create_table_simple : CREATE TABLE identifier LPAREN col_no_comma col_list RPAREN'''
-  p[0]= CreateTableStatement(p[3],[p[5]]+p[6]);
+  '''create_table_simple : CREATE TABLE if_not_exists identifier LPAREN col_no_comma col_list RPAREN'''
+  p[0]= CreateTableStatement(p[4],[p[6]]+p[7],p[3]);
 
 def p_col_list(p):
   '''col_list : col col_list'''
@@ -68,12 +69,12 @@
   p[0]= []
 
 def p_col(p):
-  '''col : COMMA identifier col_definition'''
-  p[0]= column(p[2],p[3]);
+  '''col : COMMA identifier col_definition not_null_p'''
+  p[0]= column(p[2],p[3],p[4]);
 
 def p_col_no_comma(p):
-  '''col_no_comma : identifier col_definition'''
-  p[0]= column(p[1],p[2]);
+  '''col_no_comma : identifier col_definition not_null_p'''
+  p[0]= column(p[1],p[2],p[3]);
 
 def p_col_definition(p):
   '''col_definition : BIT
@@ -110,6 +111,11 @@
   p[0]=p[1]
 
 
+def p_not_null_p(p):
+  '''not_null_p : NOT NULL
+              | empty'''
+  p[0]=len(p) > 2
+
 
 def p_create_schema(p):
   '''statement_type : create_schema_simple
@@ -172,3 +178,4 @@
     return parser.parse(subject)
   except Exception as e:
     print e
+#print parse_string("CREATE TABLE IF NOT EXISTS test(field1 INT NOT NULL);");
 
=== added file 'tests/parser_createtable_test.py'
--- tests/parser_createtable_test.py	1970-01-01 00:00:00 +0000
+++ tests/parser_createtable_test.py	2010-06-28 17:03:27 +0000
@@ -0,0 +1,32 @@
+#!/usr/bin/python
+import sys
+import unittest
+sys.path.append("../movetodrizzle")
+import helpers.parser as parser
+
+class Tester(unittest.TestCase):
+
+  def test_create_schema_1(self):
+    sql = "CREATE TABLE test(field1 INT NOT NULL);"
+    results = parser.parse_string(sql)
+    expected_results = [
+      "CreateTableStatement(table=test) (if_not_exists=False) (columns=[Column(col_name=field1) (col_definition=INT) (not_null=True)])"
+]
+    x = 0
+    for er in expected_results:
+      self.assertEqual(er, str(results[x]))
+      x += 1
+
+  def test_create_schema_2(self):
+    sql = "CREATE TABLE IF NOT EXISTS test(field1 INT NOT NULL);"
+    results = parser.parse_string(sql)
+    expected_results = [
+      "CreateTableStatement(table=test) (if_not_exists=True) (columns=[Column(col_name=field1) (col_definition=INT) (not_null=True)])"
+]
+    x = 0
+    for er in expected_results:
+      self.assertEqual(er, str(results[x]))
+      x += 1
+
+if __name__ == '__main__':
+  unittest.main()