lgy 1 неделя назад
Родитель
Сommit
a0daa936d0
1 измененных файлов с 45 добавлено и 50 удалено
  1. 45 50
      jcjyhr/vendor/topthink/think-orm/src/db/builder/Dm.php

+ 45 - 50
jcjyhr/vendor/topthink/think-orm/src/db/builder/Dm.php

@@ -18,14 +18,9 @@ use think\db\Raw;
  */
 class Dm extends Builder
 {
-    protected $query;
     protected $insertAllSql = '%INSERT% INTO %TABLE% (%FIELD%) VALUES %DATA% %COMMENT%';
     protected $updateSql    = 'UPDATE %TABLE% %JOIN% SET %SET% %WHERE% %ORDER%%LIMIT% %LOCK%%COMMENT%';
 
-    public function __construct(BaseQuery $query)
-    {
-        $this->query = $query;
-    }
     /**
      * 生成insertall SQL
      * @access public
@@ -35,51 +30,51 @@ class Dm extends Builder
      * @return string
      * @throws Exception
      */
-    public function insertAll($dataSet, $options = [], $replace = false):string
-    {
-        // 获取合法的字段
-        if ('*' == $options['field']) {
-            $fields = array_keys($this->query->getFieldsType($options['table']));
-        } else {
-            $fields = $options['field'];
-        }
-        foreach ($dataSet as $data) {
-            foreach ($data as $key => $val) {
-                if (!in_array($key, $fields, true) &&  !in_array(  strtoupper($key),$fields, true)) {
-                    if ($options['strict']) {
-                        throw new \Exception('fields not exists:[' . $key . ']');
-                    }
-                    unset($data[$key]);
-                } elseif (is_null($val)) {
-                    $data[$key] = 'NULL';
-                } elseif (is_scalar($val)) {
-                    $data[$key] = $this->parseValue($val, $key);
-                } elseif (is_object($val) && method_exists($val, '__toString')) {
-                    // 对象数据写入
-                    $data[$key] = $val->__toString();
-                } else {
-                    // 过滤掉非标量数据
-                    unset($data[$key]);
-                }
-            }
-            $value    = array_values($data);
-            $values[] = '( ' . implode(',', $value) . ' )';
-
-            if (!isset($insertFields)) {
-                $insertFields = array_map([$this, 'parseKey'], array_keys($data));
-            }
-        }
-
-        return str_replace(
-            ['%INSERT%', '%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'],
-            [
-                $replace ? 'REPLACE' : 'INSERT',
-                $this->parseTable($options['table'], $options),
-                implode(' , ', $insertFields),
-                implode(' , ', $values),
-                $this->parseComment($options['comment']),
-            ], $this->insertAllSql);
-    }
+//    public function insertAll($dataSet, $options = [], $replace = false):string
+//    {
+//        // 获取合法的字段
+//        if ('*' == $options['field']) {
+//            $fields = array_keys($this->getFieldsType($options['table']));
+//        } else {
+//            $fields = $options['field'];
+//        }
+//        foreach ($dataSet as $data) {
+//            foreach ($data as $key => $val) {
+//                if (!in_array($key, $fields, true) &&  !in_array(  strtoupper($key),$fields, true)) {
+//                    if ($options['strict']) {
+//                        throw new \Exception('fields not exists:[' . $key . ']');
+//                    }
+//                    unset($data[$key]);
+//                } elseif (is_null($val)) {
+//                    $data[$key] = 'NULL';
+//                } elseif (is_scalar($val)) {
+//                    $data[$key] = $this->parseValue($val, $key);
+//                } elseif (is_object($val) && method_exists($val, '__toString')) {
+//                    // 对象数据写入
+//                    $data[$key] = $val->__toString();
+//                } else {
+//                    // 过滤掉非标量数据
+//                    unset($data[$key]);
+//                }
+//            }
+//            $value    = array_values($data);
+//            $values[] = '( ' . implode(',', $value) . ' )';
+//
+//            if (!isset($insertFields)) {
+//                $insertFields = array_map([$this, 'parseKey'], array_keys($data));
+//            }
+//        }
+//
+//        return str_replace(
+//            ['%INSERT%', '%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'],
+//            [
+//                $replace ? 'REPLACE' : 'INSERT',
+//                $this->parseTable($options['table'], $options),
+//                implode(' , ', $insertFields),
+//                implode(' , ', $values),
+//                $this->parseComment($options['comment']),
+//            ], $this->insertAllSql);
+//    }
 
     /**
      * 字段和表名处理