Commit graph

91 commits

Author SHA1 Message Date
Gavin D'souza
e07d4236a0 Merge branch 'misc-fix-1' of github.com:gavindsouza/frappe into misc-fix-1 2020-04-17 13:41:57 +05:30
Gavin D'souza
4fa3522c3b Merge branch 'develop' into misc-fix-1 2020-04-17 13:40:49 +05:30
gavin
37bae8cfac
style: install_db re-arrange parameters
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-17 13:01:14 +05:30
Gavin D'souza
326439a4d1 fix: backups dont break if one site is corrupted 2020-04-16 14:09:21 +05:30
Gavin D'souza
30e0fa7561 style: remove unused imports 2020-04-13 12:21:31 +05:30
Gavin D'souza
275a678bd6 fix: site cleanup in case of errors on new-site
Added _new_site_cleanup to handle exceptions raised in case of
interuppted install of Frappe site. Deletes folders after calling
_drop_site
2020-04-13 11:42:02 +05:30
Aditya Hase
839114b7ff
fix: Add db-password option to new-site (#9685) 2020-03-13 15:10:59 +05:30
Chinmay D. Pai
004ddacbf1
fix: do not set db_host to % and instead pass to setup_db
db_host != the hostname part after @, hmm. so instead we'll pass
no-mariadb-socket flag to setup_database where we'll drop and create
users with host set to the TCP/IP socket instead of the UNIX socket.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-06 13:02:26 +05:30
Chinmay D. Pai
e5a896ef00
feat(db): add new-site flag to use tcp/ip instead of unix socket
ref frappe/bench#949

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-05 23:27:15 +05:30
Oshosanya Michael
8a11fb57cd feat: Allow full database config on creating site (#8874)
* Allow setting db port on install

* Allow setting db port on install

* Allow full db config on creating site

* bug fix

* bug fix

* Escape character

* Update frappe/commands/site.py

allow only integer argument

Co-Authored-By: Chinmay Pai <chinmaydpai@gmail.com>

* Update frappe/database/db_manager.py

No need to escape integer variable

Co-Authored-By: Chinmay Pai <chinmaydpai@gmail.com>

* cast port to integer to surpress pymysql error

* cast port to string to surpress pymysql error

* Removed type casting
2019-12-12 13:17:07 +05:30
Sahil Khan
9b65a7c4a1 Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:09:39 +05:30
kratos
4c5a8d41af bug fix - Postgres db connection
Missing quotes in connection string.
2019-08-08 13:22:15 +05:30
mergify[bot]
400c5f7c8e
Merge pull request #7956 from netchampfaris/skip-failing-patches-2
feat: Option to skip failing patches in migrate
2019-07-31 05:05:39 +00:00
deepeshgarg007
87e3531281 Merge branch develop into remove_user_limit 2019-07-28 19:55:28 +05:30
Faris Ansari
d06abbd852
feat: Option to skip failing patches in migrate (#7959) 2019-07-23 16:46:15 +05:30
Faris Ansari
a14e98a501 feat: Option to skip failing patches in migrate 2019-07-23 13:02:43 +05:30
Faris Ansari
da3811ab8e fix: Dont check if force 2019-07-20 20:49:06 +05:30
Faris Ansari
00e7a6a779 fix: Add no-backup option in drop-site 2019-07-20 20:41:43 +05:30
Faris Ansari
8dcfe0029d feat: add-to-hosts command 2019-07-20 20:35:36 +05:30
Faris Ansari
9cafae9d53 fix: Check if site exists before new-site 2019-07-20 20:33:50 +05:30
Faris Ansari
1389300115 fix: bench run-ui-tests command (#7844)
* fix: bench run-ui-tests command

BREAKING CHANGE
This replaces the old run-ui-tests command which used selenium to run
UI tests with Cypress.

Usage:

bench --site [sitename] run-ui-tests [app]
bench --site [sitename] run-ui-tests [app] --headless

* fix: Include adminPassword from site_config

* fix: string formatting
2019-07-05 15:30:59 +05:30
deepeshgarg007
f5a983a70d fix: Remove limits and usage info from frappe 2019-06-30 16:51:05 +05:30
Rushabh Mehta
538195de21 fix(energy-point-list): use standard list view 2019-06-05 11:29:54 +05:30
Faris Ansari
2ba5438c5f feat: Allow multiple apps to be installed to site
Usage:

`bench --site sitename install-app erpnext foundation`
2019-05-15 13:47:33 +05:30
Aditya Hase
614a8f0b46 refactor(Recorder): Cleanup 2019-02-19 21:58:58 +05:30
Aditya Hase
00d091be3b feat(recorder): New commands for recorder
Allow recorder to be started and stopped using bench commands

start: bench --site <site-name> start-recording

stop: bench --site <site-name> stop-recording
2019-02-19 21:58:55 +05:30
Saurabh
b727233948 Merge branch 'staging' into develop 2018-12-13 10:37:25 +05:30
Saurabh
5dceb7fb42 provision to setup password while adding system manager 2018-12-11 16:10:02 +05:30
Frappe Bot
a60cb001f6 Merge branch 'staging' into develop 2018-12-10 13:05:59 +00:00
Saif
58d0e8507d Allow setting MariaDB root user and pass (#6599) 2018-12-10 17:53:00 +05:30
Ameya Shenoy
c5d276b813
Merge branch 'staging' into develop 2018-11-28 08:24:00 +00:00
Ameya Shenoy
f513739d1a
Merge branch 'master' into staging-fixes 2018-11-28 07:53:35 +00:00
Saurabh
d7794ed04b additional key support 2018-11-27 12:53:19 +05:30
Saurabh
9d28467c52 [fix] support additional keys in limits 2018-11-20 15:16:49 +05:30
Suraj Shetty
5add26e407 bench browse command to open site from terminal (#6438)
* Add new bench browse command to open site from terminal

* Fix typo

* Support different variation of command
- Added support for 'bench --site site-name browse'
since we use --site option for site related commands

* Use click.echo instead of print
2018-11-12 10:48:45 +05:30
Ameya Shenoy
808835e7a1
Merge branch 'staging' into develop 2018-10-25 11:19:11 +00:00
Saurabh
7201f33eee Add more keys to site config to support subscription 2018-10-25 14:11:32 +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
Shridhar Patil
630858eb96 bench use <site> should check if the site exists (#5849)
* bench use <site> should check if the  site exists

* check site path while running use site
2018-07-23 14:35:17 +05:30
Rushabh Mehta
c6d101f0bb [fix] compileall to exclude node_modules 2018-07-02 11:14:36 +05:30
Achilles Rasquinha
112b42fb8a minor print error fix 2018-01-02 21:06:43 +05:30
Manas Solanki
3c7683e6a1 option to logout from all devices while changing password (#4419) 2017-11-10 12:11:22 +05:30
Achilles Rasquinha
b8825ca116 Pure Python MySQL instead mysqlclient (with Python C API) (#4280)
* added PyMYSQL instead mysqlclient-python

* added pymysql import

* fixed db module import

* foxed self._conn wrapper

* updated cursor migration

* removed existent converters

* some more fixes towards API port

* modified travis

* updated doctype and revereted yml

* modified travis

* refreshed logging

* raw fix

* moved from hard coded constants to declarable instances

* moved from hard coded constants to declarable instances

* refactoring and logging

* moved to global import declaration

* fixed codacy

* unfixed codacy

* minor fix

* binary_type has a single

* deprecated alternative

* merged with latest

* fixed merge conflicts

* using deprecated alternative

* raw fix

* stupid fix

* using StringTypes instead

* brutal hack

* log

* tundebazy to the rescue

* fixed content_hash error

* frappe/database.py

* frappe/database.py

* updated database.py

* updated requirements

* updated requirements

* fixed codacy

* fixed codacy

* moved from DatabaseOperationalError to pymysql.InternalError

* moved from DatabaseOperationalError to pymysql.InternalError

* fixed codacy

* empty commit

* fixed codacy

* fixed codacy
2017-11-06 16:42:01 +05:30
Rushabh Mehta
fbf8da1d37 [minor] compileall after migrate, might solve timeouts on VM (#4197) 2017-09-27 15:31:51 +05:30
Saurabh
54b6c2244d Merge branch 'master' into develop 2017-08-21 15:48:55 +05:30
Saurabh
087dd23e3b [hot][fix] add daily_emails key in clear-limits check 2017-08-21 15:32:02 +05:30
mbauskar
8e5becf32b Merge branch 'master' into develop 2017-08-17 11:00:37 +05:30
Makarand Bauskar
7bf6c19a31 [hotfix] daily_emails limit fixes (#3942) 2017-08-17 10:59:26 +05:30
mbauskar
bc603de8be resolved conflicts 2017-08-16 18:24:21 +05:30
Makarand Bauskar
91d87814ca [hotfix] add daily_emails limit to set-limit command (#3939) 2017-08-16 18:14:20 +05:30