Merge lp:~wgrant/storm/bulk-insert into lp:storm

[William Grant]

[Robert Collins (lifeless)]

The first hunk is at best confusing. Marking them up as object references @Column or whatever would help. Other than that it looks fine to me.

review: Approve

[Free Ekanayaka (free.ekanayaka)]

Nice addition, looks good to me! +1.

Maybe changing the name of the new parameter from "expr" to "values" would be a touch more meaningful.

review: Approve

[lp:~wgrant/storm/bulk-insert]

435. By William Grant on 2012-03-08

Insert's expr param is now values.

=== modified file 'NEWS'
--- NEWS	2012-03-05 20:12:44 +0000
+++ NEWS	2012-03-08 10:12:18 +0000
@@ -23,6 +23,9 @@
   There are also disconnection tests that simulate sudden termination
   of pgbouncer <http://pgfoundry.org/projects/pgbouncer/>.
 
+- Insert expressions now support multi-row and subquery INSERT
+  statements.
+
 Bug fixes
 ---------
 

=== modified file 'storm/expr.py'
--- storm/expr.py	2011-09-15 13:07:55 +0000
+++ storm/expr.py	2012-03-08 10:12:18 +0000
@@ -700,7 +700,8 @@
 class Insert(Expr):
     """Expression representing an insert statement.
 
-    @ivar map: Dictionary mapping columns to values.
+    @ivar map: Dictionary mapping columns to values, or a sequence of columns
+        for a bulk insert.
     @ivar table: Table where the row should be inserted.
     @ivar default_table: Table to use if no table is explicitly provided, and
         no tables may be inferred from provided columns.
@@ -710,17 +711,21 @@
     @ivar primary_variables: Tuple of variables with values for the primary
         key of the table where the row will be inserted.  This is a hint used
         by backends to process the insertion of rows.
+    @ivar values: Expression or sequence of tuples of values for bulk
+        insertion.
     """
     __slots__ = ("map", "table", "default_table", "primary_columns",
-                 "primary_variables")
+                 "primary_variables", "values")
 
     def __init__(self, map, table=Undef, default_table=Undef,
-                 primary_columns=Undef, primary_variables=Undef):
+                 primary_columns=Undef, primary_variables=Undef,
+                 values=Undef):
         self.map = map
         self.table = table
         self.default_table = default_table
         self.primary_columns = primary_columns
         self.primary_variables = primary_variables
+        self.values = values
 
 @compile.when(Insert)
 def compile_insert(compile, insert, state):
@@ -729,10 +734,18 @@
     state.context = TABLE
     table = build_tables(compile, insert.table, insert.default_table, state)
     state.context = EXPR
-    values = compile(tuple(insert.map.itervalues()), state)
+    values = insert.values
+    if values is Undef:
+        values = [tuple(insert.map.itervalues())]
+    if isinstance(values, Expr):
+        compiled_values = compile(values, state)
+    else:
+        compiled_values = (
+            "VALUES (%s)" %
+            "), (".join(compile(value, state) for value in values))
     state.pop()
-    return "".join(["INSERT INTO ", table, " (", columns,
-                    ") VALUES (", values, ")"])
+    return "".join(
+        ["INSERT INTO ", table, " (", columns, ") ", compiled_values])
 
 
 class Update(Expr):

=== modified file 'tests/expr.py'
--- tests/expr.py	2011-09-14 15:27:52 +0000
+++ tests/expr.py	2012-03-08 10:12:18 +0000
@@ -879,6 +879,30 @@
         self.assertEquals(value.context, EXPR)
         self.assertEquals(table.context, TABLE)
 
+    def test_insert_bulk(self):
+        expr = Insert((Column(column1, table1), Column(column2, table1)),
+                      values=[(elem1, elem2), (elem3, elem4)])
+        state = State()
+        statement = compile(expr, state)
+        self.assertEquals(
+            statement,
+            'INSERT INTO "table 1" (column1, column2) '
+            'VALUES (elem1, elem2), (elem3, elem4)')
+        self.assertEquals(state.parameters, [])
+
+    def test_insert_select(self):
+        expr = Insert((Column(column1, table1), Column(column2, table1)),
+                      values=Select(
+                        (Column(column3, table3), Column(column4, table4))))
+        state = State()
+        statement = compile(expr, state)
+        self.assertEquals(
+            statement,
+            'INSERT INTO "table 1" (column1, column2) '
+            'SELECT "table 3".column3, "table 4".column4 '
+            'FROM "table 3", "table 4"')
+        self.assertEquals(state.parameters, [])
+
     def test_update(self):
         expr = Update({column1: elem1, Func1(): Func2()}, table=Func1())
         state = State()