X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fpldbtableentry.php;h=1ab5d4cf927692bd5102b474c4f5bc991bdc6d97;hb=c4bcb1697481d3a6549f228739f17dc081641491;hp=466a4ffe35ab847ae76990b39ad1e0891fab47ec;hpb=c504af53e5b3e13f19039f1ab03cd16279ce4967;p=platal.git

diff --git a/classes/pldbtableentry.php b/classes/pldbtableentry.php
index 466a4ff..1ab5d4c 100644
--- a/classes/pldbtableentry.php
+++ b/classes/pldbtableentry.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -223,7 +223,11 @@ class JSonFieldFormatter implements PlDBTableFieldFormatter, ArrayAccess
         if (is_string($data)) {
             $this->data = json_decode($data, true);
         } else if (is_object($data)) {
-            $this->data = json_decode(json_encode($data), true);
+            if ($data instanceof PlExportable) {
+                $this->data = $data->export();
+            } else {
+                $this->data = json_decode(json_encode($data), true);
+            }
         } else if (is_array($data)) {
             $this->data = $data;
         }
@@ -477,34 +481,46 @@ class PlDBTable
     const SAVE_INSERT_MISSING   = 0x01;
     const SAVE_UPDATE_EXISTING  = 0x02;
     const SAVE_IGNORE_DUPLICATE = 0x04;
-    public function saveEntry(PlDBTableEntry $entry, $flags)
+    public function saveEntries(array $entries, $flags)
     {
         $flags &= (self::SAVE_INSERT_MISSING | self::SAVE_UPDATE_EXISTING | self::SAVE_IGNORE_DUPLICATE);
         Platal::assert($flags != 0, "Hey, the flags ($flags) here are so stupid, don't know what to do");
         if ($flags == self::SAVE_UPDATE_EXISTING) {
-            $values = array();
-            foreach ($this->mutableFields as $field) {
-                if ($entry->hasChanged($field)) {
-                    $values[] = XDB::format($field . ' = {?}', $entry->$field);
+            foreach ($entries as $entry) {
+                $values = array();
+                foreach ($this->mutableFields as $field) {
+                    if ($entry->hasChanged($field)) {
+                        $values[] = XDB::format($field . ' = {?}', $entry->$field);
+                    }
+                }
+                if (count($values) > 0) {
+                    XDB::rawExecute('UPDATE ' . $this->table . '
+                                        SET ' . implode(', ', $values) . '
+                                      WHERE ' . $this->buildKeyCondition($entry,
+                                                                         $this->keyFields(self::PRIMARY_KEY),
+                                                                         false));
                 }
-            }
-            if (count($values) > 0) {
-                XDB::rawExecute('UPDATE ' . $this->table . '
-                                    SET ' . implode(', ', $values) . '
-                                  WHERE ' . $this->buildKeyCondition($entry,
-                                                                     $this->keyFields(self::PRIMARY_KEY),
-                                                                     false));
             }
         } else {
-            $values = array();
-            foreach ($this->schema as $field=>$type) {
-                if ($entry->hasChanged($field)) {
-                    $values[$field] = XDB::escape($entry->$field);
+            $fields = new PlFlagSet();
+            foreach ($entries as $entry) {
+                foreach ($this->schema as $field=>$type) {
+                    if ($type->inPrimaryKey || $entry->hasChanged($field)) {
+                        $fields->addFlag($field);
+                    }
                 }
             }
-            if (count($values) > 0) {
-                $query = $this->table . ' (' . implode(', ', array_keys($values)) . ')
-                               VALUES  (' . implode(', ', $values) . ')';
+            if (count($fields->export()) > 0) {
+                foreach ($entries as $entry) {
+                    $v = array();
+                    foreach ($fields as $field) {
+                        $v[$field] = XDB::escape($entry->$field);
+                    }
+                    $values[] = '(' . implode(', ', $v) . ')';
+                }
+
+                $query = $this->table . ' (' . implode(', ', $fields->export()) . ')
+                               VALUES ' . implode(",\n", $values);
                 if (($flags & self::SAVE_UPDATE_EXISTING)) {
                     $update = array();
                     foreach ($this->mutableFields as $field) {
@@ -513,23 +529,26 @@ class PlDBTable
                         }
                     }
                     if (count($update) > 0) {
-                        $query = 'INSERT ' . $query;
+                        $query = 'INSERT INTO ' . $query;
                         $query .= "\n  ON DUPLICATE KEY UPDATE " . implode(', ', $update);
                     } else {
-                        $query = 'INSERT IGNORE ' . $query;
+                        $query = 'INSERT IGNORE INTO ' . $query;
                     }
                 } else if (($flags & self::SAVE_IGNORE_DUPLICATE)) {
-                    $query = 'INSERT IGNORE ' . $query;
+                    $query = 'INSERT IGNORE INTO ' . $query;
                 } else {
-                    $query = 'INSERT ' . $query;
+                    $query = 'INSERT INTO ' . $query;
                 }
                 XDB::rawExecute($query);
-                $id = XDB::insertId();
-                if ($id) {
-                    foreach ($this->primaryKey as $field) {
-                        if ($this->schema[$field]->autoIncrement) {
-                            $entry->$field = $id;
-                            break;
+                if (count($entries) == 1) {
+                    $id = XDB::insertId();
+                    if ($id) {
+                        $entry = end($entries);
+                        foreach ($this->primaryKey as $field) {
+                            if ($this->schema[$field]->autoIncrement) {
+                                $entry->$field = $id;
+                                break;
+                            }
                         }
                     }
                 }
@@ -733,13 +752,7 @@ class PlDBTableEntry extends PlAbstractIterable implements PlExportable
 
     public function save($flags)
     {
-        if (!$this->preSave()) {
-            return false;
-        }
-        $this->table->saveEntry($this, $flags);
-        $this->changed->clear();
-        $this->postSave();
-        return true;
+        return self::saveBatch(array($this), $flags);
     }
 
     public function update($insertMissing = false)
@@ -772,6 +785,36 @@ class PlDBTableEntry extends PlAbstractIterable implements PlExportable
     {
         return $this->table->exportEntry($this);
     }
+
+    protected static function saveBatch($entries, $flags)
+    {
+        $table = null;
+        foreach ($entries as $entry) {
+            if (is_null($table)) {
+                $table = $entry->table;
+            } else {
+                Platal::assert($table === $entry->table, "Cannot save batch of entries of different kinds");
+            }
+            if (!$entry->preSave()) {
+                return false;
+            }
+        }
+        $table->saveEntries($entries, $flags);
+        foreach ($entries as $entry) {
+            $entry->changed->clear();
+            $entry->postSave();
+        }
+        return true;
+    }
+
+    public static function insertBatch($entries, $allowUpdate = false)
+    {
+        $flags = PlDBTable::SAVE_INSERT_MISSING;
+        if ($allowUpdate) {
+            $flags |= PlDBTable::SAVE_UPDATE_EXISTING;
+        }
+        return self::saveBatch($entries, $flags);
+    }
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: