Commit Graph
254 Commits
Author SHA1 Message Date
wangyidong 4ad76f6162 * Adjust check consistency for upgrade and update standard sql. 2023-12-06 10:00:59 +08:00
songchenxuan 7d66afbccc * Fix dao redeclear bug. 2023-12-01 10:46:06 +08:00
songchenxuan 9570e8252c * Fix dao redeclare bug. 2023-12-01 10:45:06 +08:00
tanghucheng 3d94eac50a Merge branch 'Merge184' into c07e4a71eb 2023-11-30 21:21:55 -05:00
tanghucheng 5770bc47ba * Merge 18.x upgrade. 2023-11-29 01:37:58 -05:00
tanghucheng d670173438 Merge remote-tracking branch 'origin/master' into Merge184 2023-11-23 00:52:55 -05:00
liugang a35744b631 Revert "+ Reset dao::errors before CRUD to prevent from last CRUD disturb new CRUD."
This reverts commit 28a23d805b.
2023-11-23 13:04:18 +08:00
tanghucheng 6cc4b872db * Merge 18.8 lib/dao and front into Merge184. 2023-11-22 21:53:56 -05:00
tanghucheng fc37c0b19b Merge branch 'master' into Merge184 2023-11-15 19:59:22 -05:00
qixinzhi 7a5cd6fd40 * Add en comment. 2023-11-15 16:15:00 +08:00
qixinzhi 1261283192 * Add comment for throwError. 2023-11-15 16:14:03 +08:00
qixinzhi c02ef0f520 * Add throwError flag for throw exception with sql error. 2023-11-15 16:13:16 +08:00
hufangzhou a60622d4e4 * Merge: 18.4 version's framework and lib directory. 2023-11-14 16:58:03 +08:00
wangyidong 334936ff5a * Fix js error. 2023-11-08 13:59:16 +08:00
xieqiyu d533d561c1 + Add judgment when database data is null. 2023-10-31 03:27:26 +00:00
daitingting b1ecdbcc22 * Adjust the way to check whether the data has the field or not. 2023-10-26 08:53:23 +00:00
daitingting c90f1d8949 * The field is seted when it is null. 2023-10-26 05:40:16 +00:00
朱金勇 6948740e1d * Migrate changes from 18.x to master. 2023-10-12 08:42:59 +00:00
dingguodong 186bb55781 * Change invalid comment. 2023-10-07 08:53:27 +08:00
dingguodong 4b5b7a6ae8 * Fix typo, trimed to trimmed. 2023-09-28 17:25:33 +08:00
dingguodong f7c4ef91e6 * Support more column naming rule, like 'updated_unix_desc'. 2023-09-28 17:24:12 +08:00
dingguodong 5234f01110 * Use = instead of IN if there is only one item to compare. 2023-09-22 10:44:29 +08:00
daitingting b52db07695 * Get the field type. 2023-09-18 07:06:24 +00:00
dingguodong 1c01dcec44 * Change INT to int. 2023-09-08 10:59:36 +08:00
dingguodong c25433b45f * Return directly if the data is a numeric type to make sure cleanInt works. 2023-09-08 10:14:11 +08:00
dingguodong 944eea4293 * Add type hint. 2023-09-06 10:27:02 +08:00
dingguodong 1cf2695f22 + Add function to filter a filed is null or not. 2023-09-04 14:50:43 +08:00
tianshujie 33fd417f81 * Change the set recPerPage order. 2023-08-02 13:18:16 +08:00
daitingting c05c1ba48e * Refactor the obtain view. 2023-07-31 08:01:21 +00:00
liugang 853e08c6fc * baseDAO: fix the replace method generate error sql. 2023-07-12 14:02:57 +08:00
qixinzhi 7a032ff49e * Update dao from master. 2023-07-11 03:19:01 +00:00
zhouxin ada87b5594 * Support query SQLite. 2023-06-19 16:17:24 +08:00
zhouxin bd582f55e9 * Add queue to exec sql use SQLite. 2023-06-19 15:57:40 +08:00
zhouxin f835c8fc16 * Push insert/update/delete sql to queue. 2023-06-14 13:45:19 +08:00
zhouxin 2b93e8d1ff * Support select from SQLite. 2023-06-14 11:19:54 +08:00
liuyongkai f337ce3739 * Add save sqlite queue function. 2023-06-11 10:19:46 +00:00
liuyongkai 81050e5bb7 * Add function to convert mysql sql to sqlite sql. 2023-06-11 09:15:15 +00:00
liuyongkai e0b6facd98 * Support write into SQLite by dao. 2023-06-11 07:26:36 +00:00
dingguodong 03cb5c3b8f * Replace this use of "join" with "implode". 2023-05-31 10:36:01 +08:00
dingguodong 4d6377011e * Replace '$foo === NULL' with 'is_null($foo)' which faster and better. 2023-05-31 10:36:01 +08:00
dingguodong b03b41760e * Replace the "die()" call. 2023-05-31 10:36:00 +08:00
Lufei 003c048c1e * Fix PHP Deprecated: ctype_alnum(): Argument of type int will be interpreted as string in the future. 2023-05-24 14:04:19 +08:00
liumengyi 19722a00d1 * Fix error when the arg1 parameter is a number. 2023-05-24 09:59:25 +08:00
liugang 5a296edf82 - baseDAO: convert numbers to strings because the deleted field is declared as an enum type but used as a number type. 2023-05-23 14:36:13 +08:00
liugang a10fdda8b9 * baseDAO: do not convert null values or numbers to strings. 2023-05-23 14:24:56 +08:00
朱金勇 1bd75e6929 * Refactor batchCreate of task. 2023-05-23 03:01:23 +00:00
dingguodong cc4451ca17 * Assign the $sql to $this->sqlobj, so sqlError() can print the full sql statement if any exception occurs. 2023-05-22 16:46:36 +08:00
liugang 92622a21db * lib: change the return value of the get() method to mixed. 2023-05-19 13:19:17 +08:00
liugang efbe41395d * lib: declare the parameter's type and return type of the get() method. 2023-05-18 15:13:45 +08:00
tianshujie b355e93d40 * Change alert to window.alert. 2023-05-17 11:04:31 +08:00