Merge pull request #2 from OliveCMS/v2.1

V2.1

Author: xtoolkit

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v2.1
+
+* add limit for find method
+* fix mysql rel problem
+* fix mysql insert and update string poblem
+* update doc
+* move colorconsole to dev
+
 ## v2.0
 
 UDSM now have D2T (Database 2 Table) mode! this option is a solution for when Addon can not auto create database! with this mode, app can create auto database.

addons/MySQL/Point.php

@@ -170,7 +170,7 @@ public function createColumn($db, $table, $name, $options)
             $d = $options['__udms_rel'];
             $e = key($d);
             $c = $d[$e];
-            $options = $ui[$this->getCore->ot][$c];
+            $options = $ui[$e][$c];
             $rel_detect = true;
         }
         if (isset($options['__udms_config']['mysql_' . $this->type])) {
@@ -267,7 +267,7 @@ public function insert($db, $table, $data)
                     $options = $ui[$e][$c];
                 }
                 if (in_array(strtoupper($options['type']), $this->str_type)) {
-                    $data[$col] = '\'' . $value . '\'';
+                    $data[$col] = '\'' . str_replace(['\\', '\'', '"'], ['\\\\', '\\\'', '\\"'], $value) . '\'';
                 }
             }
         }
@@ -291,7 +291,7 @@ public function update($db, $table, $uid, $data)
                     $options = $ui[$e][$c];
                 }
                 if (in_array(strtoupper($options['type']), $this->str_type)) {
-                    $data[$col] = '\'' . $value . '\'';
+                    $data[$col] = '\'' . str_replace(['\\', '\'', '"'], ['\\\\', '\\\'', '\\"'], $value) . '\'';
                 }
             }
             $do[] = "`$col` = " . $data[$col];

composer.json

@@ -6,7 +6,9 @@
   "require": {
     "php": ">=5.5",
     "mongodb/mongodb": "^1.4",
-    "olive-cms/tools": "^1.0",
+    "olive-cms/tools": "^1.0"
+  },
+  "require-dev": {
     "olive-cms/colorconsole": "^1.0"
   },
   "autoload": {

doc/01-usage.md

@@ -302,6 +302,38 @@ if($udms->school->availableColumnRule()) {
 $udms->school->student->createColumn('studnet',
   [] // config
 );
+/**
+ * config available:
+ * @param type -> [int, text]
+ * @param length -> (0==ultimate)
+ * @param index -> [primary]
+ * @param auto -> [start => int, add => int]
+ * @param __udms_rel -> [table => column]
+ */
+/*
+# example 1:
+$udms->school->classes->createColumn('id',
+  [
+    'type' => 'int',
+    'lenght' => 8,
+    'index' => 'primary',
+    'auto' => [
+      'start' => 1000000,
+      'add' => 367
+    ]
+  ]
+);
+
+# example 2:
+
+$udms->school->classes->createColumn('t_id',
+  [
+    '__udms_rel' => [
+      'teacher' => 'id'
+    ]
+  ]
+);
+ */
 ```
 
 ### Exists Column
@@ -419,7 +451,8 @@ $list_1 = $udms->school->student->get(
     'relation' => false,
     'sort' => [
       'lname' => SORT_ASC
-    ]
+    ],
+    'limit' => 5
   ]
 );
 /* output array

src/Core.php

@@ -380,6 +380,16 @@ public function createDatabase($name, $option = [])
             $dl[] = $name;
             $this->setD2T($dl);
         }
+        $ui = $this->getAppModel();
+        if (! isset($ui[$name])) {
+            $ui[$name] = [];
+            $this->setAppModel($ui);
+        }
+        $ud = $this->getAppModelData();
+        if (! isset($ud[$name])) {
+            $ud[$name] = [];
+            $this->setAppModelData($ud);
+        }
     }
 
     public function dropDatabase($name)
@@ -395,6 +405,16 @@ public function dropDatabase($name)
                 }
                 $this->setD2T(array_diff($this->getD2T(), [$name]));
             }
+            $ui = $this->getAppModel();
+            if (isset($ui[$name])) {
+                unset($ui[$name]);
+                $this->setAppModel($ui);
+            }
+            $ud = $this->getAppModelData();
+            if (isset($ud[$name])) {
+                unset($ud[$name]);
+                $this->setAppModelData($ud);
+            }
         } else {
             throw new UException($this->getUCPath(), 'your database name has not exists (' . $name . ')', 112);
         }
@@ -437,6 +457,19 @@ public function renameDatabase($name, $to)
             $dl[$key] = $to;
             $this->setD2T($dl);
         }
+
+        $ui = $this->getAppModel();
+        if (isset($ui[$name])) {
+            $ui[$to] = $ui[$name];
+            unset($ui[$name]);
+            $this->setAppModel($ui);
+        }
+        $ud = $this->getAppModelData();
+        if (isset($ud[$name])) {
+            $ud[$to] = $ud[$name];
+            unset($ud[$name]);
+            $this->setAppModelData($ud);
+        }
     }
 
     public function __get($name)

src/Model/Table.php

@@ -119,10 +119,9 @@ public function createColumn($name, $options = [])
         $this->getCore->execute->createColumn($this->dbname, $this->table, $name, $options);
         $ud = $this->getCore->getDatabaseModelData($this->dbname);
         if (isset($options['auto'])) {
-            if (count($options['auto']) == 0) {
-                $start = 1;
-                $add = 1;
-            } else {
+            $start = 1;
+            $add = 1;
+            if (count($options['auto']) > 0) {
                 if (isset($options['auto']['start'])) {
                     $start = $options['auto']['start'];
                 }
@@ -285,6 +284,9 @@ public function find($filters = [], $options = [])
             }
             $return = call_user_func_array([$this, 'orderBy'], $args);
         }
+        if (isset($options['limit']) and is_int($options['limit']) and $options['limit'] > 0) {
+            $return = array_slice($return, 0, $options['limit']);
+        }
 
         return $return;
     }