Commit graph

69 commits

Author SHA1 Message Date
phot0n
42fcf61cae refactor: allow root deletion by default for nested set
* deprecate allow_root_deletion param in on_trash nestedset hook
* allowed to turn root deletion off by allow_root_deletion class variable
in doctype controller
2022-09-02 21:37:38 +05:30
Deepak
9c4318028a feat: Allow Root deletion for tree doctypes 2022-09-02 19:47:13 +05:30
Ankush Menat
9ce3d3c81b docs: warning for remove subtree
[skip ci]
2022-08-25 11:35:53 +05:30
Raffael Meyer
d05ed27a01
feat: remove subtree (#17647)
* feat: remove subtree

* test: remove_subtree
2022-08-25 11:34:05 +05:30
Ankush Menat
81b37cb7d2
refactor: clean up code to py310 supported features (#17367)
refactor: clean up code to py39+ supported syntax

- f-strings instead of format
- latest typing support instead of pre 3.9 TitleCase
- remove UTF-8 declarations.
- many more changes

Powered by https://github.com/asottile/pyupgrade/ + manual cleanups
2022-07-01 11:51:05 +05:30
gavin
e92ead1257 refactor: Re-write queries using SubQuery 2022-05-27 17:32:37 +05:30
chillaranand
25f82e966c refactor: Remove unused imports & code 2022-05-19 15:34:35 +05:30
Ankush Menat
3fb1eaf13b
perf: dont query for impossible child/ancestor (#16577)
Also avoid manual plucking
2022-04-12 13:31:57 +05:30
Suraj Shetty
c0c5b2ebdd
style: format all python files using black (#16453)
Co-authored-by: Frappe Bot <developers@frappe.io>
2022-04-12 10:59:25 +05:30
Gavin D'souza
9e01a022b8 fix(nestedset): update_move_node
Revert to past-like structure and maintain only query conversions
2022-04-04 15:14:37 +05:30
Gavin D'souza
5ff587fc40 fix(nestedset): Fix rgt value via update_add_node
This bug was introduced via 3358fdf9a9
2022-04-04 12:36:18 +05:30
Gavin D'souza
2d806b5d6d fix: Ported subqry to branch for compatibility
Via https://github.com/frappe/frappe/pull/16107
2022-03-31 13:41:08 +05:30
Gavin D'souza
3358fdf9a9 refactor(nestedset): Using qb or db APIs inplace of raw SQLs 2022-03-30 17:59:22 +05:30
barredterra
8a4f316ec5 refactor: remove useless pass, log error 2022-03-20 02:35:35 +01:00
Gavin D'souza
981564e544 Merge branch 'develop' into frappe-postgres-changes 2022-01-07 11:37:28 +05:30
Conor
55392b64e7 fix: Revert changes made to fix collation differences
Due to collation differences in MariaDB and Postgres, tests gave
inconsistent results. This was to be handled in tests alone instead of
the application. It was unnecessary. Collation changes should be made at DBMS config
level only. Accomodating for those in the application will unnecessarily
degrade performance for everyone.

Other changes:
* use pluck in user_type
* revert ordering in nestedset
* revert parsing in order_field
* use preferred APIs & styling

Co-authored-by: gavin <gavin18d@gmail.com>
2022-01-07 10:45:10 +05:30
Conor
40ba1ac9ba fix: Postgres Compatibility
* Handle inconsistencies in type handling in DatabaseQuery & Database
  APIs
* Update incompatible queries with frappe.qb notation
* Fixed use cases discovered by failing ERPNext CI tests

fix: db independent syntax for user_type

fix: handle postgres datetime values

feat: add ability to auto commit on db inserts

feat: add ability to escape underscore in postgres

fix: handle missing data in test runner bootstrapping

fix: db independent syntax for queries

fix: refactor to use qb

fix: update cache for language

fix: use pluck in email_queue

Co-authored-by: gavin <gavin18d@gmail.com>

fix: don't auto insert on tests for make_property_setter

fix: remove auto_commit in custom_field insertion

fix: remove auto_commit functionality

fix: review comments

fix: revert link validation

fix: style suggestion for readability

Co-authored-by: gavin <gavin18d@gmail.com>

fix: revert .lower() in link validation

fix: add rollback for setup_wizard

Revert "fix: add rollback for setup_wizard"

This reverts commit 83b3b0913db17718ccd5edae01858cff15603829.

Revert "feat: add ability to escape underscore in postgres"

This reverts commit 8ed9c2aa3306438e94bb813f60e65b416d0b947b.

fix: more concise representation of order fields

Co-authored-by: gavin <gavin18d@gmail.com>
2022-01-07 10:44:57 +05:30
Suraj Shetty
9258941151 fix: Do not allow rebuilding of tree for doctypes without lft & rgt 2022-01-03 14:25:42 +05:30
Raffael Meyer
7c0078d8e4
feat: Convenience methods for NestedSet {get_parent, get_children} (#13579)
* feat: new properties `NestedSet.{parent, children}`

* fix: typo

* refactor: remove unused kwargs

* feat: method instead of property

* feat: use generator

* docs: fix docstring to match modified method

* refactor: add type hints

* refactor: type hints as string for compatibility with python <3.7

https://stackoverflow.com/questions/33533148/how-do-i-type-hint-a-method-with-the-type-of-the-enclosing-class

* refactor: import Iterator for type annotation

* refactor: Apply suggestions from code review

Co-authored-by: gavin <gavin18d@gmail.com>

Co-authored-by: gavin <gavin18d@gmail.com>
2021-11-17 04:32:11 +00:00
Ankush Menat
6a50442936 refactor(minor): better variable names 2021-11-09 17:11:41 +05:30
Ankush Menat
fb929566cc fix: don't change modified when updating lft/rgt
These are implementation details and not explicitly modified by user.
IMO these `modified` value shouldn't change just because node has moved
around due to NSM change.

as
2021-11-09 17:11:39 +05:30
Gavin D'souza
6d212c2d02 refactor(minor): Don't re-write var, use set_value
* doctype variable was being re-defined which broke functionality. Fixed
  that, re-used getattr for consistency
* Use set_value instead of raw query
* Style fixes
2021-11-03 16:13:09 +05:30
Aradhya-Tripathi
3ba3269b9d refactor: converted SELECT queries 2021-10-27 00:00:46 +05:30
Aradhya-Tripathi
cd9e0ffa84 refactor: converted queries in nameing and nestedset 2021-10-26 22:20:03 +05:30
Gavin D'souza
3446026555 chore: Update header: license.txt => LICENSE
The license.txt file has been replaced with LICENSE for quite a while
now. INAL but it didn't seem accurate to say "hey, checkout license.txt
although there's no such file". Apart from this, there were
inconsistencies in the headers altogether...this change brings
consistency.
2021-09-03 12:02:59 +05:30
Deepesh Garg
f1f8678ee0 fix: Remove for update flag from aggregate functions 2021-07-19 10:54:22 +05:30
Deepesh Garg
0c3e923e0f fix: Remove for update flag from aggregate functions 2021-07-19 10:49:44 +05:30
Deepesh Garg
33f8bfcaf2 fix: Add for update in nest set model updates 2021-07-18 17:46:16 +05:30
Gavin D'souza
e407b78506 chore: Drop dead and deprecated code
* Remove six for PY2 compatability since our dependencies are not, PY2
  is legacy.
* Removed usages of utils from future/past libraries since they are
  deprecated. This includes 'from __future__ ...' and 'from past...'
  statements.
* Removed compatibility imports for PY2, switched from six imports to
  standard library imports.
* Removed utils code blocks that handle operations depending on PY2/3
  versions.
* Removed 'from __future__ ...' lines from templates/code generators
* Used PY3 syntaxes in place of PY2 compatible blocks. eg: metaclass
2021-05-26 15:31:29 +05:30
Deepesh Garg
f2d619bb2c fix: Check for command in case of API call 2021-02-24 15:43:03 +05:30
Deepesh Garg
38861decab fix: Only for system manager 2021-02-24 15:23:49 +05:30
Deepesh Garg
ce9843ee4a fix: Only for system manager 2021-02-24 15:22:17 +05:30
Deepesh Garg
9e19d13262 fix: Check for perm 2021-02-21 18:35:34 +05:30
Deepesh Garg
7f2e645593 feat: Provision to rebuild NSM from treeview 2021-01-27 16:46:47 +05:30
sahil28297
ac1c8c7c3f
fix(nestedset): check if meta has nsm_parent_field 2019-09-03 22:15:59 +05:30
Faris Ansari
bff94703cf feat: Create NestedSet doctypes via configuration 2019-09-02 15:58:52 +05:30
Faris Ansari
478dbb98c6 fix: Get all ancestors
When a file is uploaded by Guest, the folder size needs to be updated,
which breaks because get_ancestors uses `get_list`
2019-04-10 16:10:03 +05:30
Rushabh Mehta
428bcd71a9 feat(minor): frappe.utils.nestedset.get_descendants_of now accepts ignore_permissions 2019-04-08 19:04:39 +05:30
Frappe Bot
bfc25ad1e5 Merge branch 'master' into develop 2019-02-15 10:21:47 +00:00
Zlash65
1d8f35ce97 fix: use orm instead of query 2019-02-01 15:53:01 +05:30
Zlash65
04b3a5cabc feat: added a utility method to get all the descendants of a node 2019-02-01 12:14:45 +05:30
Zlash65
a7e127e498 fix: get ancestors for a node with more filters 2019-02-01 12:14:45 +05:30
Prateeksha Singh
1f1e70d335 [fix] Better multiple root node message 2018-12-11 16:10:02 +05:30
Rushabh Mehta
2e6a202652 Postgres support for Frappe (#5919)
* [start] postgres

* [wip] started refactoring db_schema

* Add psycopg2 to requirements.txt

* Add support for Postgres SQL

- Separate frameworkSQL, database, schema, setup_db file for
mariaDB and postgres
- WIP

* Remove quotes from sql to make it compatible with postgres as well

* Moved some code from db_schema to database.py

* Move code from db_schema to schema.py

Add other required refactoring

* Add schema chages

* Remove redundant code in file

* Add invalid column name exception class to exceptions.py

* Add back tick in query wherever needed and replace ifnull with coalesce

* Update get_column_description code in database.py file

* Remove a print statement

* Add keys to get on_duplicate query

* Add bactick wherever necessary

- Remove db_schema.py file

* Remove DATE_SUB as it is incompatible with postgres

- Fix prepare_filter_condition

* Add backtick and quotes wherever necessary
- Move get_database_size to frappe.db namespace
- fix some left out bugs and errors

* Add code to create key and unique index
- added mysql and posgres in their respective database.py

* Add more bacticks in queries and fix some errors
- Pass keys to on_duplicate_update method
- Replace MONTH with EXTRACT function
- Remove DATEDIFF and CURDATE usage

* Cast state value to int in toggle_two_factor_auth
- since two_factor_auth has the datatype of Int

* Refactor
- Replace Timediff with normal arithmetic operator
- Add MAX_COLUMN_LENGTH
- Remove Redundant code
- Add regexp character constant
- Move create_help_table to database.py
- Add get_full_text_search_condition method
- Inherit MariaDBTable from DBTable

* Replace Database instance with get_db method

* Move db_manager to separate file

* Refactor
- Remove some unwanted code
- Separate alter table code for postgres and mysql
- Replace data_type with column_type in database.py

* Make fulltext search changes in global_search.py

* Add empty string check

* Add root_password to site config

* Create cli command for postgres console

* Move setup of help database to setup_db.py

* Add get_database_list method

* Fix exception handling
- Replace bad_field handler with missing_column handler

* Fix tests and sql queries

* Fix import error

* Fix typo db -> database

* Fix error with make_table in help.py

* Try test for postgres

* Remove pyhton 2.7 version to try postgres travis test

* Add test fixes

* Add db_type to the config of test_site_postgres

* Enable query debug to check the reason for travis fail

* Add backticks to check if the test passes

* Update travis.yml
- Add postgres addon

* Try appending 'd_' to hash for db_name
- since postgres does not support dbname starting with a number

* Try adding db_type for global help to make travis work

* Add print statements to debug travis failure

* Enable transaction and remove debug flag

* Fix help table creation query (postgres)

* Fix import issue

* Add some checks to prevent errors
- Some doctypes used to get called even before they are created

* Try fixes

* Update travis config

* Fix create index for help table

* Remove unused code

* Fix queries and update travis config

* Fix ifnull replace logic (regex)

* Add query fixes and code cleanup

* Fix typo
- get_column_description -> get_table_columns_description

* Fix tests
- Replace double quotes in query with single quote

* Replace psycopg2 with psycopg2-binary to avoid warnings
- http://initd.org/psycopg/docs/install.html#binary-install-from-pypi

* Add multisql api

* Add few multisql queries

* Remove print statements

* Remove get_fulltext_search_condition method and replace with multi query

* Remove text slicing in create user

* Set default for 'values' argument in multisql

* Fix incorrect queries and remove few debug flags
- Fix multisql bug

* Force delete user to fix test
- Fix Import error
- Fix incorrect query

* Fix query builder bug

* Fix bad query

* Fix query (minor)

* Convert boolean text to int since is_private has datatype of int
- Some query changes like removed double quotes
and replace with interpolated string to pass multiple
value pass in one of the query

* Extend database class from an object to support python 2

* Fix query
- Add quotes around value passed to the query for variable comparision

* Try setting host_name for each test site
- To avoid "RemoteDisconnected" error while testing data migration test
- Update travis.yml to add hosts
- Remove unwanted commit in setup_help_database

* Set site hostname to data migration connector (in test file)
- To connect the same site host

* Fix duplicate entry issue
- the problem is in naming series file.
In previous commits I unknowingly changed a part of a series query
due to which series were not getting reset

* Replace few sql queries with orm methods

* Fix codacy

* Fix 'Doctype Sessions not found' issue

* Fix bugs induced during codacy fixes

* Fix Notification Test

- Use ORM instead of raw sql

* Set Date fallback value to 0001-01-01

- 0000-00-00 is invalid date in Postgres
- 0001-01-01 works in both

* Fix date filter method

* Replace double quotes with single quote for literal value

* Remove print statement

* Replace double quotes with single

* Fix tests

- Replace few raw sql with ORM

* Separate query for postgres

- update_fields_to_fetch_query

* Fix tests

- replace locate with strpos for postgres

* Fix tests

- Skip test for datediff
- convert bytes to str in escape method

* Remove TestBot

* Skip fieldname extraction

* Replace docshare raw sql with ORM

* Fix typo

* Fix ancestor query test

* Fix test data migration

* Remove hardcoded hostname

* Add default option and option list for db_type

* Remove frappe.async module

* Remove a debug flag from test

* Fix codacy

* fix import issue

* Convert classmethod to static method

* Convert few instance methods to static methods

* Remove some unused imports

* Fix codacy

- Add exception type
- Replace few instance methods with static methods
- Remove unsued import

* Fix codacy

* Remove unused code

* Remove some unused codes

- Convert some instance methods to static function

* Fix a issue with query modification

* Fix add_index query

* Fix query

* Fix update_auth patch

* Fix a issue with exception handling

* Add try catch to a reload_doc

* Add try-catch to file_manager_hook patch

* import update_gravatar to set_user_gravatar patch

* Undo all the wrong patch fixes

* Fix db_setup code 😪
- previously it was not restoring db from source SQL
which is why few old patched were breaking
(because they were getting different schema structure)

* Fix typo !

* Fix exception(is_missing_column) handling

* Add deleted code
- This code is only used in a erpnext patch.
Can be moved to that patch file

* Fix codacy

* Replace a mariadb specific function in a query used in validate_series

* Remove a debug flag

* Revert changes (rename_parent_and_child)

* Fix validate_one_root method

* Fix date format issue

* Fix codacy
- Disable a pylint for variable argument warning
- Convert an instance method to static method

* Add bandit.yml

The Codacy seems to use Bandit which generates
warning for every subprocess import and its usage during pytest
Since we have carefully used subprocess (avoided user input),
warnings needs to be avoided.
This can be removed if we have any alternative for subprocess usage.

* Skip start_process_with_partial_path check

* Fix typo

* Add python 2.7 test

* Move python versions in travis.yml

* Add python versions to jobs

* Overwrite python version inheritance for postgres in travis.yml

* Add quotes around python version in .travis.yml

* Add quotes around the name of the job

* Try a travis fix

* Try .travis.yml fix

* Import missing subprocess

* Refactor travis.yml

* Refactor travis.yml
- move install and tests commands to separate files
- Use matrix to build combination of python version and db type

* Make install.sh and run-tests.sh executable

* Add sudo required to travis.yml to allow sudo cmmands in shell files

* Load nvm

* Remove verbose flag from scripts

* Remove command-trace-print flag

* Change to build dir in before script

* Add absolute path for scripts

* Fix tests

* Fix typo

* Fix codacy
- fixes - "echo won't expand escape sequences." warning

* Append (_) underscore instead of 'd' for db_name

* Remove printf and use mysql execute flag
2018-09-21 10:20:48 +05:30
Zarrar
2691b52375 Minor fix (#5663)
* minor nestedset fix

* set current node as selected node in tree
2018-06-08 14:44:53 +05:30
Nabin Hait
5095eed157 get root of nestedset docs 2018-05-29 16:16:21 +05:30
Zlash65
634e3f3dbb bypass root node validation if no parent found 2018-01-08 11:53:29 +05:30
Zarrar
9927eecc9c fix issue with node delete for tree based doctypes (#4554) 2017-11-30 11:51:43 +05:30
rohitwaghchaure
ef7c6c3389 [fix] Item group test cases (#4555) 2017-11-30 11:48:59 +05:30
Zarrar
bef90ee10e making nestedset a bit more flexible (#4552) 2017-11-29 18:39:56 +05:30