Commit Graph

232 Commits

Author SHA1 Message Date
Itai Shirav
191eac4424 Remove unused method 2019-02-27 08:56:04 +02:00
Itai Shirav
7ed62ffd2c Merge branch 'qs-with-totals' of https://github.com/carrotquest/infi.clickhouse_orm into carrotquest-qs-with-totals 2019-02-27 08:45:22 +02:00
Itai Shirav
ad81a811fc Memory engine does not support PREWHERE 2019-02-27 08:41:16 +02:00
Itai Shirav
64920a96c7 Merge branch 'qs-prewhere' of https://github.com/carrotquest/infi.clickhouse_orm into carrotquest-qs-prewhere 2019-02-27 07:41:17 +02:00
Itai Shirav
b8fd39c6a6 Use HTTP Basic Authentication instead of passing the credentials in the URL 2019-02-26 23:12:32 +02:00
Itai Shirav
81e942a4d2 Fix pagination when asking for the last page on a query that matches no records 2019-02-26 22:58:59 +02:00
Itai Shirav
bec45b53fa Fix parsing of server errors in ClickHouse v19.3.3+ 2019-02-26 22:46:00 +02:00
Kuzma Leshakov
cb91971fd9 Fix #110 2019-02-22 14:38:12 +03:00
Itai Shirav
efe270b502 Migrations - cannot add a new materialized field after a regular field 2019-01-28 10:08:07 +02:00
Itai Shirav
f96bd22c38 Functions WIP 2019-01-28 09:51:53 +02:00
Kirill Potekhin
1388dd9e27 UUIDField added for ClickHouse UUID type 2018-12-20 01:35:13 +03:00
M1ha
6902de3b94 Fix fo conditions_as_sql method by review 2018-12-19 10:06:57 +05:00
M1ha
d912bf56d7 Merge branch 'qs-prewhere' into qs-with-totals 2018-12-17 10:30:01 +05:00
M1ha
d1e61dc420 Fixed invalid condtion joins in _filter_or_exclude (multiple_exclude_test) 2018-12-17 10:26:35 +05:00
M1ha
375316fbf3 Merge branch 'develop' into qs-prewhere
# Conflicts:
#	src/infi/clickhouse_orm/query.py
2018-12-17 10:21:58 +05:00
Itai Shirav
602d0671f1 Functions WIP 2018-12-14 17:19:32 +02:00
Itai Shirav
9df82a44ec Added verify_ssl_cert parameter to database initializer 2018-12-14 11:13:23 +02:00
Itai Shirav
8c22c753a8 Use requests Session object for better performance 2018-12-14 11:06:57 +02:00
Itai Shirav
64d15cf3b6 Update docs 2018-12-14 08:34:40 +02:00
Itai Shirav
2f54b3ca5a Merge branch 'qs-final' of https://github.com/carrotquest/infi.clickhouse_orm into carrotquest-qs-final 2018-12-14 08:31:48 +02:00
Itai Shirav
5c78c315ee Update test to verify issue #89 2018-12-14 08:29:08 +02:00
Itai Shirav
3478e59dd3 Merge branch 'issue-89-fix' of https://github.com/carrotquest/infi.clickhouse_orm into carrotquest-issue-89-fix 2018-12-14 08:21:29 +02:00
Itai Shirav
374f2dfe3e Update docs 2018-12-14 08:20:43 +02:00
M1ha
c56820fb6c Fix https://github.com/Infinidat/infi.clickhouse_orm/issues/89 2018-12-13 15:40:08 +05:00
M1ha
5f4023f120 Added with_totals method 2018-12-12 15:33:35 +05:00
M1ha
0c92e2ac74 Simplified conditions, built by Q objects, if many conditions are joined in same mode 2018-12-11 18:04:08 +05:00
M1ha
12463c61b8 1) Fixed bugs
2) Edited the docs
3) Added test for prewhere
2018-12-11 17:25:54 +05:00
M1ha
76dfdb6012 Fixed bug in final() method engine validation 2018-12-11 16:47:39 +05:00
M1ha
95055996ad 1) Further refactoring of as_sql():
merged very similar QuerySet and AggregateQuerySet methods
2) Fixed some bugs, caused by conditions_as_sql() parameters change
2018-12-08 11:57:08 +05:00
M1ha
3bc5f27cda 1) Unified QuerySet filter and exclude methods,
so both can load *q and **kwargs at the same time
 and accept prewhere flag
2) Added ability to add prewhere clause
 in QuerySet.filter() and QuerySet.exclude() methods
3) Added ability to check, if Q() object is empty (including bool check)
4) Refactored QuerySet.as_sql() method:
 + don't add GROUP BY and WHERE if it's not needed
 + ability to add PREWHERE condition
 + Common style of adding optional query parts
2018-12-08 11:40:05 +05:00
M1ha
7f38f8c654 Added fina() QuerySet method
Added tests for ite
Not tested in case of https://github.com/Infinidat/infi.clickhouse_orm/issues/93
2018-12-02 12:14:19 +05:00
P R
75f0ad9882
Update database.py
Added connection timeout parameter
2018-11-28 00:09:53 +07:00
Itai Shirav
962a1673f9 Functions WIP 2018-10-24 16:30:37 +03:00
Itai Shirav
f24749112e support decimal fields 2018-10-14 09:26:07 +03:00
Itai Shirav
658c7b42ee Bug fix: wrong parentheses when building queries using Q objects 2018-10-13 19:49:12 +03:00
Itai Shirav
f2a731711d Bug fix: QuerySet.count() ignores slicing 2018-10-13 19:29:36 +03:00
Itai Shirav
6416b25818 Merge branch 'filtering_null' of https://github.com/kalombos/infi.clickhouse_orm into kalombos-filtering_null 2018-08-19 18:36:08 +03:00
Itai Shirav
44d3dcee34 Added Database.does_table_exist method 2018-08-19 18:20:17 +03:00
Itai Shirav
acf2f7a189 Check for database existence, to allow delayed creation 2018-08-19 18:02:37 +03:00
Itai Shirav
32c77ab190 Include alias and materialized fields in queryset results 2018-08-19 16:18:15 +03:00
Itai Shirav
be1cbdee76 Add validation of array field's inner field 2018-08-13 08:36:01 +03:00
fanchi
5059902947 Added a test for isinstance and fixed a bug 2018-07-05 16:36:51 +03:00
fanchi
3fa18d32d9 Add method to check instance types of field and its inner fields 2018-07-04 18:32:08 +03:00
fanchi
a836031d36 Trivial fix nullable field disregard extra_null_values 2018-07-02 10:47:36 +03:00
kalombo
a32453394a add support for Filtering null values 2018-06-26 17:20:11 +05:00
Itai Shirav
86f05a0c23 Python 3 compatibility 2018-06-10 16:17:35 +03:00
Itai Shirav
d7382e1ce2 fix field name parsing when field contains double underscore #69 2018-06-10 14:27:51 +03:00
Itai Shirav
e0b125f6a6 Merge branch 'add-timezone-breaker' of https://github.com/vv-p/infi.clickhouse_orm into vv-p-add-timezone-breaker 2018-06-10 14:08:20 +03:00
Itai Shirav
2bca8b4fb8 Improve creation time of model instances by keeping a dictionary of default values 2018-05-14 07:37:56 -04:00
Itai Shirav
ab0755ad90 - Rename Model.system to Model._system to prevent collision with a column that has the same name
- Rename `Model.readonly` to `Model._readonly` to prevent collision with a column that has the same name
- The `field_names` argument to `Model.to_tsv` is now mandatory
2018-05-14 07:09:57 -04:00
Itai Shirav
1bd3e63cd4 minor improvements in error handling and testing 2018-05-10 15:24:38 +03:00
Понаревский Владимир
c20846122f Fix after review 2018-05-08 17:24:27 +03:00
Понаревский Владимир
793726adb2 Fix after review 2018-05-08 16:41:50 +03:00
Понаревский Владимир
a5c93dc176 Add disabler for the timezone getting 2018-05-08 13:19:45 +03:00
M1ha
eb15dd65ec Added custom partitioning to all MergeTree family engines 2018-04-24 15:19:05 +05:00
Itai Shirav
20e609f952 Update docs 2018-04-21 15:23:00 +03:00
Itai Shirav
7cc5c50240 Merge branch 'issue-66' of https://github.com/carrotquest/infi.clickhouse_orm into carrotquest-issue-66 2018-04-21 13:50:09 +03:00
Itai Shirav
66eda2214c Make tests pass 2018-04-21 13:27:42 +03:00
Itai Shirav
b6229125a3 Merge branch 'custom_partitioning' of https://github.com/carrotquest/infi.clickhouse_orm into carrotquest-custom_partitioning
# Conflicts:
#	src/infi/clickhouse_orm/engines.py
#	src/infi/clickhouse_orm/models.py
#	tests/test_database.py
#	tests/test_engines.py
2018-04-21 13:04:19 +03:00
Itai Shirav
6fa6786a9c Update docs 2018-04-21 12:10:30 +03:00
Ivan Ladelshchikov
a5f2fa4d76 add Distributed engine 2018-04-21 11:48:32 +03:00
Ivan Ladelshchikov
3268019216 _fields and _writable_fields are OrderedDicts 2018-04-21 11:48:32 +03:00
Ivan Ladelshchikov
57112f9de6 add ServerError exception 2018-04-21 11:48:32 +03:00
M1ha
0927136ffd 1) Added a test on https://github.com/Infinidat/infi.clickhouse_orm/issues/66
2) Fixed issue
2018-04-20 12:38:36 +05:00
M1ha
7fb0589692 1. Added support of custom partitioning (https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/)
2. Added attribute server_version to Database class
3. Changed Engine.create_table_sql(), Engine.drop_table_sql(), Model.create_table_sql(), Model.drop_table_sql()  parameter to db from db_name
2018-04-12 14:21:46 +05:00
Itai Shirav
cd8d82c226 Update docs 2018-04-07 15:20:33 +03:00
desile
c98edc4f77 Added doc for between operator 2017-12-03 21:54:58 +03:00
pv.larkin
d553aaf9eb Add between operator 2017-11-29 14:52:52 +03:00
pv.larkin
0342dc863b Add OR and AND operations for Q objects 2017-11-29 14:27:54 +03:00
Itai Shirav
fa3f96e464 Merge branch 'migrate_materialized_fields' of https://github.com/carrotquest/infi.clickhouse_orm into carrotquest-migrate_materialized_fields
# Conflicts:
#	tests/sample_migrations/0012.py
#	tests/test_migrations.py (reverted from commit 288db6a28f56b9ae5a4fa1c0ead111f679886488)
2017-10-30 15:49:25 +02:00
Itai Shirav
b758333f42 Merge branch 'dollar_issue_fix' of https://github.com/carrotquest/infi.clickhouse_orm into carrotquest-dollar_issue_fix 2017-10-30 15:30:31 +02:00
Itai Shirav
b93c145cde Merge branch 'tsionyx-develop' into develop 2017-10-30 15:28:37 +02:00
Itai Shirav
314090fa56 Merge branch 'raw_migrations' of https://github.com/carrotquest/infi.clickhouse_orm into carrotquest-raw_migrations 2017-10-30 15:09:23 +02:00
Itai Shirav
dcbf371077 Merge branch 'develop' of https://github.com/anci/infi.clickhouse_orm into anci-develop 2017-10-30 15:07:00 +02:00
Itai Shirav
48c08b869e Merge branch 'carrotquest-develop' into develop 2017-10-30 15:00:17 +02:00
Ivan Ladelshchikov
50e63fb1f8 show field name in error when invalid value assigned 2017-10-10 15:30:37 +04:00
M1ha
5ea20a11a9 Added tests and resolved https://github.com/Infinidat/infi.clickhouse_orm/issues/47 2017-10-10 12:24:17 +05:00
M1ha
b952f93e78 Merge branch 'develop' of https://github.com/Infinidat/infi.clickhouse_orm into migrate_materialized_fields 2017-10-10 11:24:35 +05:00
M1ha
911af41ec1 Fixed https://github.com/Infinidat/infi.clickhouse_orm/issues/56 issue 2017-10-04 17:53:23 +05:00
Ivan Ladelshchikov
38472012db allow ISO 8601 compliant values in DateTimeField 2017-10-03 13:26:00 +04:00
M1ha
51a814732b Merge branch 'develop' of https://github.com/Infinidat/infi.clickhouse_orm into raw_migrations
# Conflicts:
#	docs/schema_migrations.md
#	tests/sample_migrations/0010.py
#	tests/sample_migrations/0011.py
2017-10-02 15:49:59 +05:00
M1ha
b28e11c69d Added RunPython and RunSQL migration types 2017-09-20 10:08:07 +05:00
anci
322b4a0741 add field names list explicitly to Database.insert method 2017-09-18 21:50:40 +03:00
M1ha
0391482ec7 Fixed 2 bugs in Merge engine:
1) If database name contained some signes (+, -) create merge table failed.
2) When merge table was created and set_database was not previously called, "currentDatabase()" was also used, which could lead to errors on multiple databases.
2017-09-18 15:53:15 +05:00
Itai Shirav
8304ddca5c Update docs 2017-09-13 12:17:26 +03:00
Itai Shirav
59564f8c70 Add distinct method to querysets 2017-09-13 12:15:48 +03:00
Itai Shirav
7bbcae574a Add AlterTableWithBuffer migration operation 2017-09-13 12:15:48 +03:00
M1ha
430872b958 Added readonly parameter to all Field subclasses 2017-09-11 10:17:23 +05:00
M1ha
b7cf611595 Fixed error text 2017-09-08 09:15:30 +05:00
M1ha
de9f64cd3a Added Merge engine
1) Divided readonly and system flags of Field model. Readonly flag only restricts insert operations, while system flag restricts also create and drop table operations

2) Added Merge engine and tests for it
3) Added docs for Merge engine
4) Added opportunity to make Field readonly. This is useful for "virtual" columns (https://clickhouse.yandex/docs/en/single/index.html#virtual-columns)
2017-09-07 17:44:27 +05:00
M1ha Shvn
0829936940 Merge branch 'develop' into develop 2017-08-22 13:33:01 +05:00
M1ha
508c959d2c Fixed bug with getting SystemPart info on actual ClickHouse version (1.1.54245) 2017-08-22 13:27:40 +05:00
Marsel
88b1cea98c Fix TypeError in Py3 2017-08-20 10:37:11 +03:00
Marsel
c4e60ca2a8 Include unicode_literals 2017-08-20 10:37:11 +03:00
Marsel
70d34b097f Fix python3 compatibility 2017-08-20 10:37:11 +03:00
Itai Shirav
67e0442645 - Nullable arrays not supported in latest ClickHouse version
- system.parts table no longer includes "replicated" column in latest ClickHouse version
2017-08-20 09:30:40 +03:00
Itai Shirav
639867bb32 - Added QuerySet.paginate()
- Support for basic aggregation in querysets
2017-08-14 12:14:52 +03:00
Itai Shirav
cb6c329d32 Migrations: when creating a table for a BufferModel, create the underlying table too if necessary 2017-06-26 11:09:57 +03:00
Itai Shirav
1966896850 Support queryset slicing 2017-06-24 12:28:42 +03:00
Itai Shirav
2c0ef08ee1 Minor refactoring of extra_null_values 2017-06-23 11:10:49 +03:00