dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,528 Commits 18 Branches 72 Tags
b2bc1835c3e66ab9d284c58688047ed750ebbe21
Commit Graph
3940 Commits
Author SHA1 Message Date
Stephen Tanner b2bc1835c3 Removed extra 'i' character inserted accidentally due to mode switching in vim. 2014-10-14 17:21:00 -04:00
Stephen Tanner 617abda1cc Fixed DB2 adapter when using executesql and placeholders. 2014-10-14 17:02:10 -04:00
mdipierro 05689aa526 another attempt at added ssl option for tornado #511 2014-09-30 09:38:00 -05:00
mdipierro 7c8d91d4c5 Merge pull request #486 from gi0baro/DAL-modular 
Added modular DAL, updated gluon imports to new structure
 2014-09-30 00:24:26 -05:00
mdipierro ed4febf9db Merge pull request #509 from niphlod/fix/json_and_decimals 
always stringify decimals. Better docstrings and a few PEP8.
 2014-09-29 19:45:17 -05:00
niphlod b2d5775f82 always stringify decimals. Better docstrings and a few PEP8. 2014-09-25 21:28:55 +02:00
gi0baro db01261c35 Fixed globals 2014-09-25 13:16:54 +02:00
gi0baro 6b38fb769b Fix baseAdapter 2014-09-25 13:02:51 +02:00
gi0baro 6e9eeb50bc MSSQL3 types 2014-09-25 12:57:44 +02:00
gi0baro 502327e531 Fixed merge conflict 2014-09-25 12:51:39 +02:00
gi0baro 5c07c511fa Merge branch 'master' into DAL-modular 
* master: (58 commits)
  changed version number
  better types by default, given that we're on 2005 at least
  fix for StorageList and tests added
  improved coverage, fix bug with IS_LIST_OF and items not being strings
  fix cache.increment, added tests
  R-2.9.11
  reverted simplejson
  R-2.9.10
  upgraded memcache and markdown2
  upgraded pypyodbc.py
  upgraded simplejson
  no more split in contains, thanks Niphlod
  fixed wording and bug on contains(), made smart_query use ilike instead of like
  ilike, thanks Niphlod
  CROSS JOIN, thanks jotbe
  added custom represent to GoogleDatastoreAdapter, thanks Alan
  postgresql: identifies what adapter auto-loads json values
  added more tests for json Field
  fixed typo in driver_auto_json
  Improve the graphing to show the name of the application.
  ...

Conflicts:
	gluon/dal.py
	gluon/globals.py
	gluon/tests/test_dal.py
 2014-09-25 12:49:16 +02:00
niphlod 0721988b65 added tests for gluon/html.py and gluon/serializers.py 
uhm
 2014-09-24 22:14:55 +02:00
mdipierro 4c45de7efd Merge pull request #505 from niphlod/fix/mssql3_mappings 
better types for mssql3://, given that we're on 2005 at least
 2014-09-24 13:35:08 -05:00
niphlod 4d42442c31 better types by default, given that we're on 2005 at least 2014-09-23 00:04:42 +02:00
niphlod 34a417cfa0 fix for StorageList and tests added 
gluon/storage.py
StorageList had a recursion error (please check the implementation before committing)

gluon/tests*
added the fix_path module to avoid those ugly lines at the beginning of each test file
added tests for gluon.contenttype and test_fileutils
added tests for missing Storage methods
 2014-09-21 08:26:38 +02:00
mdipierro bb199ad533 Merge pull request #503 from niphlod/tests/validators 
improved coverage, fix bug with IS_LIST_OF and items not being strings
 2014-09-20 12:55:56 -05:00
gi0baro 947dcbc226 Updated from latest web2py master 2014-09-19 17:37:35 +02:00
niphlod 8bbd22eba8 improved coverage, fix bug with IS_LIST_OF and items not being strings 2014-09-19 00:15:25 +02:00
niphlod 50f16744a7 fix cache.increment, added tests 2014-09-16 23:50:10 +02:00
mdipierro df234fa252 reverted simplejson 2014-09-15 18:30:37 -05:00
mdipierro a38c7c2aa8 upgraded memcache and markdown2 2014-09-15 07:34:14 -05:00
mdipierro f0461ae84a upgraded pypyodbc.py 2014-09-14 16:41:47 -05:00
mdipierro 0120ad5b95 upgraded simplejson 2014-09-14 16:37:09 -05:00
mdipierro e38565345c no more split in contains, thanks Niphlod 2014-09-14 16:01:47 -05:00
niphlod 05a92e86f7 fixed wording and bug on contains(), made smart_query use ilike instead of like 2014-09-14 22:45:19 +02:00
mdipierro 75f2b90151 ilike, thanks Niphlod 2014-09-14 15:28:48 -05:00
mdipierro 6a75132d54 CROSS JOIN, thanks jotbe 2014-09-14 14:57:12 -05:00
mdipierro 3d9ebb5720 Merge pull request #497 from jotbe/master 
Fixed #1810: DAL.select(left=...) causes "Unknown column 't1.i1' in 'on ...
 2014-09-14 14:55:38 -05:00
mdipierro ec62375f6d Merge pull request #500 from niphlod/fix/postgresql_json 
postgresql: identifies what adapter auto-loads json values
 2014-09-14 14:53:45 -05:00
mdipierro f1ac5126a1 Merge pull request #499 from niphlod/tests/json_type 
added more tests for json Field
 2014-09-14 14:53:16 -05:00
mdipierro ce897b3569 added custom represent to GoogleDatastoreAdapter, thanks Alan 2014-09-14 11:58:16 -05:00
Niphlod c4a4ee27c4 postgresql: identifies what adapter auto-loads json values 2014-09-14 16:39:54 +02:00
Niphlod ecc6e5dc5e added more tests for json Field 2014-09-14 16:01:22 +02:00
mdipierro b991f2926f fixed typo in driver_auto_json 2014-09-13 18:55:03 -05:00
mdipierro d81f4606db fixed mongodb json? 2014-09-13 10:35:54 -05:00
mdipierro d29a108ad7 better native_json naming convention 2014-09-12 20:28:46 -05:00
mdipierro 94a0b1aec5 fixed json field representation 2014-09-12 20:17:49 -05:00
Jan Beilicke 0a571338b6 Fixed #1810: DAL.select(left=...) causes "Unknown column 't1.i1' in 'on clause'" 
According to the MySQL 5.5 manual [1], comma-separated table references in joins
should be wrapped in parenthesis or JOIN should be used instead of comma.

Further explanation from the manual: The ON clause takes precedence since
a couple of versions so the operands for the ON clause change:

SELECT * FROM t1, t2 JOIN t3 ON (t1.i1 = t3.i3);

The operands for the ON are t2 and t3. t1.i1 is not known at this point.

[1] https://dev.mysql.com/doc/refman/5.5/en/join.html
 2014-09-13 01:38:57 +02:00
Ricardo Pedroso cd2920c2cf fix infinite loop in request_password 2014-09-12 22:39:25 +01:00
mdipierro 0863bb3eca case insensitive autocomplete again 2014-09-12 11:36:26 -05:00
niphlod 5c9796ac72 refactored pickling of sessions 2014-09-11 22:51:23 +02:00
mdipierro cef7202781 fixed is_crypt in tools, thanks Anthony 2014-09-11 12:09:43 -05:00
mdipierro c3478f660a fixed pickling of session 2014-09-10 13:57:54 -05:00
mdipierro 09a44d41ae Merge pull request #493 from niphlod/fix/refactoring_pickle 
refactored pickle everywhere but Session, removed unused imports
 2014-09-10 12:27:34 -05:00
niphlod 6403878f95 refactored pickle everywhere but Session, removed unused imports 2014-09-10 19:12:10 +02:00
niphlod bd87879cde added test for storage pickling 2014-09-10 18:24:52 +02:00
mdipierro c3cd32cc4f possible fix to rss 2014-09-10 08:26:23 -05:00
mdipierro b98687239c ASSIGNJS 2014-09-08 19:18:55 -05:00
gi0baro b20b81b8f5 Updated DatabaseStoredFile to latest web2py master 2014-09-08 15:59:16 +02:00
mdipierro 94aab906d5 fixed serialization of Storage objects 2014-09-08 08:10:58 -05:00