From e3953bded72807e2b8f6099081993b1082655871 Mon Sep 17 00:00:00 2001 From: olliemath Date: Tue, 27 Jul 2021 22:33:11 +0100 Subject: [PATCH] Chore: remove intermediate dirs --- .noseids | 1073 ----------------- README.md | 2 +- buildout.cfg | 68 -- clickhouse_orm/__init__.py | 13 + .../database.py | 4 +- .../engines.py | 2 +- .../fields.py | 0 .../funcs.py | 0 .../migrations.py | 2 +- .../models.py | 2 +- .../query.py | 2 +- .../system_models.py | 0 .../utils.py | 2 +- docs/class_reference.md | 12 +- docs/contributing.md | 8 +- docs/expressions.md | 2 +- docs/field_options.md | 6 +- docs/field_types.md | 2 +- docs/importing_orm_classes.md | 32 +- docs/index.md | 6 +- docs/models_and_databases.md | 6 +- docs/ref.md | 10 +- docs/schema_migrations.md | 4 +- docs/system_models.md | 4 +- docs/toc.md | 12 +- docs/whats_new_in_version_2.md | 4 +- examples/cpu_usage/collect.py | 2 +- examples/cpu_usage/models.py | 2 +- examples/cpu_usage/requirements.txt | 2 +- examples/cpu_usage/results.py | 2 +- examples/db_explorer/requirements.txt | 2 +- examples/db_explorer/server.py | 2 +- examples/full_text_search/load.py | 2 +- examples/full_text_search/models.py | 2 +- examples/full_text_search/requirements.txt | 2 +- examples/full_text_search/search.py | 2 +- scripts/generate_ref.py | 14 +- scripts/test_python3.sh | 4 +- src/infi/__init__.py | 1 - src/infi/clickhouse_orm/__init__.py | 13 - tests/base_test_with_data.py | 8 +- tests/sample_migrations/0001_initial.py | 4 +- tests/sample_migrations/0002.py | 4 +- tests/sample_migrations/0003.py | 4 +- tests/sample_migrations/0004.py | 4 +- tests/sample_migrations/0005.py | 4 +- tests/sample_migrations/0006.py | 4 +- tests/sample_migrations/0007.py | 4 +- tests/sample_migrations/0008.py | 4 +- tests/sample_migrations/0009.py | 4 +- tests/sample_migrations/0010.py | 2 +- tests/sample_migrations/0011.py | 2 +- tests/sample_migrations/0012.py | 2 +- tests/sample_migrations/0013.py | 4 +- tests/sample_migrations/0014.py | 2 +- tests/sample_migrations/0015.py | 2 +- tests/sample_migrations/0016.py | 2 +- tests/sample_migrations/0017.py | 2 +- tests/sample_migrations/0018.py | 2 +- tests/sample_migrations/0019.py | 2 +- tests/test_alias_fields.py | 10 +- tests/test_array_fields.py | 10 +- tests/test_buffer.py | 4 +- tests/test_compressed_fields.py | 12 +- tests/test_constraints.py | 2 +- tests/test_custom_fields.py | 8 +- tests/test_database.py | 14 +- tests/test_datetime_fields.py | 8 +- tests/test_decimal_fields.py | 8 +- tests/test_dictionaries.py | 2 +- tests/test_engines.py | 2 +- tests/test_enum_fields.py | 8 +- tests/test_fixed_string_fields.py | 8 +- tests/test_funcs.py | 6 +- tests/test_indexes.py | 2 +- tests/test_inheritance.py | 8 +- tests/test_ip_fields.py | 8 +- tests/test_join.py | 2 +- tests/test_materialized_fields.py | 10 +- tests/test_migrations.py | 10 +- tests/test_models.py | 8 +- tests/test_mutations.py | 2 +- tests/test_nullable_fields.py | 10 +- tests/test_querysets.py | 6 +- tests/test_readonly.py | 2 +- tests/test_server_errors.py | 2 +- tests/test_simple_fields.py | 2 +- tests/test_system_models.py | 10 +- tests/test_uuid_fields.py | 8 +- 89 files changed, 223 insertions(+), 1365 deletions(-) delete mode 100644 .noseids delete mode 100644 buildout.cfg create mode 100644 clickhouse_orm/__init__.py rename {src/infi/clickhouse_orm => clickhouse_orm}/database.py (99%) rename {src/infi/clickhouse_orm => clickhouse_orm}/engines.py (99%) rename {src/infi/clickhouse_orm => clickhouse_orm}/fields.py (100%) rename {src/infi/clickhouse_orm => clickhouse_orm}/funcs.py (100%) rename {src/infi/clickhouse_orm => clickhouse_orm}/migrations.py (99%) rename {src/infi/clickhouse_orm => clickhouse_orm}/models.py (99%) rename {src/infi/clickhouse_orm => clickhouse_orm}/query.py (99%) rename {src/infi/clickhouse_orm => clickhouse_orm}/system_models.py (100%) rename {src/infi/clickhouse_orm => clickhouse_orm}/utils.py (98%) delete mode 100644 src/infi/__init__.py delete mode 100644 src/infi/clickhouse_orm/__init__.py diff --git a/.noseids b/.noseids deleted file mode 100644 index 5023878..0000000 --- a/.noseids +++ /dev/null @@ -1,1073 +0,0 @@ -(dp1 -S'failed' -p2 -(lp3 -S'84' -p4 -aS'87' -p5 -aS'88' -p6 -aS'89' -p7 -aS'122' -p8 -aS'132' -p9 -aS'136' -p10 -aS'137' -p11 -aS'138' -p12 -aS'139' -p13 -aS'143' -p14 -aS'144' -p15 -aS'145' -p16 -aS'146' -p17 -aS'147' -p18 -aS'148' -p19 -aS'149' -p20 -aS'150' -p21 -aS'152' -p22 -aS'153' -p23 -aS'156' -p24 -aS'157' -p25 -aS'158' -p26 -aS'159' -p27 -aS'162' -p28 -aS'163' -p29 -aS'164' -p30 -aS'165' -p31 -aS'166' -p32 -aS'168' -p33 -aS'191' -p34 -asS'source_names' -p35 -(lp36 -S'.' -asS'ids' -p37 -(dp38 -I1 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_alias_fields.py' -S'tests.test_alias_fields' -p39 -S'MaterializedFieldsTest.test_assignment_error' -tp40 -sI2 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_alias_fields.py' -g39 -S'MaterializedFieldsTest.test_duplicate_default' -tp41 -sI3 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_alias_fields.py' -g39 -S'MaterializedFieldsTest.test_insert_and_select' -tp42 -sI4 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_alias_fields.py' -g39 -S'MaterializedFieldsTest.test_wrong_field' -tp43 -sI5 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_array_fields.py' -S'tests.test_array_fields' -p44 -S'ArrayFieldsTest.test_assignment_error' -tp45 -sI6 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_array_fields.py' -g44 -S'ArrayFieldsTest.test_conversion' -tp46 -sI7 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_array_fields.py' -g44 -S'ArrayFieldsTest.test_insert_and_select' -tp47 -sI8 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_array_fields.py' -g44 -S'ArrayFieldsTest.test_invalid_inner_field' -tp48 -sI9 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_array_fields.py' -g44 -S'ArrayFieldsTest.test_parse_array' -tp49 -sI10 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_buffer.py' -S'tests.test_buffer' -p50 -S'BufferTestCase.test_insert_buffer' -tp51 -sI11 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_compressed_fields.py' -S'tests.test_compressed_fields' -p52 -S'CompressedFieldsTestCase.test_assignment' -tp53 -sI12 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_compressed_fields.py' -g52 -S'CompressedFieldsTestCase.test_confirm_compression_codec' -tp54 -sI13 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_compressed_fields.py' -g52 -S'CompressedFieldsTestCase.test_defaults' -tp55 -sI14 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_compressed_fields.py' -g52 -S'CompressedFieldsTestCase.test_string_conversion' -tp56 -sI15 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_compressed_fields.py' -g52 -S'CompressedFieldsTestCase.test_to_dict' -tp57 -sI16 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_custom_fields.py' -S'tests.test_custom_fields' -p58 -S'CustomFieldsTest.test_boolean_field' -tp59 -sI17 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -S'tests.test_database' -p60 -S'DatabaseTestCase.test_add_setting' -tp61 -sI18 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_count' -tp62 -sI19 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_does_table_exist' -tp63 -sI20 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_dollar_in_select' -tp64 -sI21 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__empty' -tp65 -sI22 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__generator' -tp66 -sI23 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__iterator' -tp67 -sI24 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__list' -tp68 -sI25 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__medium_batches' -tp69 -sI26 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__small_batches' -tp70 -sI27 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_invalid_user' -tp71 -sI28 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_missing_engine' -tp72 -sI29 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_nonexisting_db' -tp73 -sI30 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_pagination' -tp74 -sI31 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_pagination_empty_page' -tp75 -sI32 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_pagination_invalid_page' -tp76 -sI33 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_pagination_last_page' -tp77 -sI34 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_pagination_with_conditions' -tp78 -sI35 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_potentially_problematic_field_names' -tp79 -sI36 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_preexisting_db' -tp80 -sI37 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_raw' -tp81 -sI38 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_select' -tp82 -sI39 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_select_ad_hoc_model' -tp83 -sI40 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_select_partial_fields' -tp84 -sI41 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_select_with_totals' -tp85 -sI42 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_special_chars' -tp86 -sI43 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_datetime_fields.py' -S'tests.test_datetime_fields' -p87 -S'DateFieldsTest.test_ad_hoc_model' -tp88 -sI44 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -S'tests.test_decimal_fields' -p89 -S'DecimalFieldsTest.test_ad_hoc_model' -tp90 -sI45 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_aggregation' -tp91 -sI46 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_assignment_error' -tp92 -sI47 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_assignment_ok' -tp93 -sI48 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_insert_and_select' -tp94 -sI49 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_min_max' -tp95 -sI50 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_precision_and_scale' -tp96 -sI51 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_rounding' -tp97 -sI52 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -S'tests.test_engines' -p98 -S'DistributedTestCase.test_bad_cluster_name' -tp99 -sI53 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_insert_distributed_select_local' -tp100 -sI54 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_insert_local_select_distributed' -tp101 -sI55 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_minimal_engine' -tp102 -sI56 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_minimal_engine_no_superclasses' -tp103 -sI57 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_minimal_engine_two_superclasses' -tp104 -sI58 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_verbose_engine_two_superclasses' -tp105 -sI59 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_with_table_name' -tp106 -sI60 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_without_table_name' -tp107 -sI61 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_collapsing_merge_tree' -tp108 -sI62 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_custom_partitioning' -tp109 -sI63 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_log' -tp110 -sI64 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_memory' -tp111 -sI65 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_merge' -tp112 -sI66 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_merge_tree' -tp113 -sI67 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_merge_tree_with_granularity' -tp114 -sI68 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_merge_tree_with_sampling' -tp115 -sI69 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_replacing_merge_tree' -tp116 -sI70 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_replicated_merge_tree' -tp117 -sI71 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_replicated_merge_tree_incomplete' -tp118 -sI72 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_summing_merge_tree' -tp119 -sI73 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_tiny_log' -tp120 -sI74 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -S'tests.test_enum_fields' -p121 -S'EnumFieldsTest.test_ad_hoc_model' -tp122 -sI75 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -g121 -S'EnumFieldsTest.test_assignment_error' -tp123 -sI76 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -g121 -S'EnumFieldsTest.test_conversion' -tp124 -sI77 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -g121 -S'EnumFieldsTest.test_default_value' -tp125 -sI78 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -g121 -S'EnumFieldsTest.test_enum_array' -tp126 -sI79 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -g121 -S'EnumFieldsTest.test_insert_and_select' -tp127 -sI80 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_fixed_string_fields.py' -S'tests.test_fixed_string_fields' -p128 -S'FixedStringFieldsTest.test_ad_hoc_model' -tp129 -sI81 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_fixed_string_fields.py' -g128 -S'FixedStringFieldsTest.test_assignment_error' -tp130 -sI82 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_fixed_string_fields.py' -g128 -S'FixedStringFieldsTest.test_insert_and_select' -tp131 -sI83 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -S'tests.test_funcs' -p132 -S'FuncsTestCase.test_arithmetic_operators' -tp133 -sI84 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_base64_functions' -tp134 -sI85 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_comparison_operators' -tp135 -sI86 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_date_functions' -tp136 -sI87 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_filter_date_field' -tp137 -sI88 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_filter_float_field' -tp138 -sI89 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_func_as_field_value' -tp139 -sI90 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_func_to_sql' -tp140 -sI91 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_logical_operators' -tp141 -sI92 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_string_functions' -tp142 -sI93 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_type_conversion_functions' -tp143 -sI94 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_inheritance.py' -S'tests.test_inheritance' -p144 -S'InheritanceTestCase.test_create_table_sql' -tp145 -sI95 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_inheritance.py' -g144 -S'InheritanceTestCase.test_field_inheritance' -tp146 -sI96 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_inheritance.py' -g144 -S'InheritanceTestCase.test_get_field' -tp147 -sI97 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_join.py' -S'tests.test_join' -p148 -S'JoinTest.test_with_db_name' -tp149 -sI98 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_join.py' -g148 -S'JoinTest.test_with_subquery' -tp150 -sI99 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_join.py' -g148 -S'JoinTest.test_without_db_name' -tp151 -sI100 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_materialized_fields.py' -S'tests.test_materialized_fields' -p152 -S'MaterializedFieldsTest.test_assignment_error' -tp153 -sI101 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_materialized_fields.py' -g152 -S'MaterializedFieldsTest.test_duplicate_default' -tp154 -sI102 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_materialized_fields.py' -g152 -S'MaterializedFieldsTest.test_insert_and_select' -tp155 -sI103 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_materialized_fields.py' -g152 -S'MaterializedFieldsTest.test_wrong_field' -tp156 -sI104 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_migrations.py' -S'tests.test_migrations' -p157 -S'MigrationsTestCase.test_migrations' -tp158 -sI105 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -S'tests.test_models' -p159 -S'ModelTestCase.test_assignment' -tp160 -sI106 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_assignment_error' -tp161 -sI107 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_defaults' -tp162 -sI108 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_field_name_in_error_message_for_invalid_value_in_assignment' -tp163 -sI109 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_field_name_in_error_message_for_invalid_value_in_constructor' -tp164 -sI110 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_string_conversion' -tp165 -sI111 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_to_dict' -tp166 -sI112 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -S'tests.test_nullable_fields' -p167 -S'NullableFieldsTest.test_ad_hoc_model' -tp168 -sI113 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -g167 -S'NullableFieldsTest.test_insert_and_select' -tp169 -sI114 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -g167 -S'NullableFieldsTest.test_isinstance' -tp170 -sI115 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -g167 -S'NullableFieldsTest.test_nullable_datetime_field' -tp171 -sI116 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -g167 -S'NullableFieldsTest.test_nullable_string_field' -tp172 -sI117 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -g167 -S'NullableFieldsTest.test_nullable_uint8_field' -tp173 -sI118 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -S'tests.test_querysets' -p174 -S'AggregateTestCase.test_aggregate_no_grouping' -tp175 -sI119 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_on_aggregate' -tp176 -sI120 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_distinct' -tp177 -sI121 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_explicit_grouping' -tp178 -sI122 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_filter' -tp179 -sI123 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_implicit_grouping' -tp180 -sI124 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_indexing' -tp181 -sI125 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_no_calculated_fields' -tp182 -sI126 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_only' -tp183 -sI127 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_order_by' -tp184 -sI128 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_pagination' -tp185 -sI129 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_slicing' -tp186 -sI130 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_totals' -tp187 -sI131 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_wrong_grouping' -tp188 -sI132 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_double_underscore_field' -tp189 -sI133 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_filter_on_calculated_field' -tp190 -sI134 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_arithmetic_operators' -tp191 -sI135 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_comparison_operators' -tp192 -sI136 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_filter_date_field' -tp193 -sI137 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_filter_float_field' -tp194 -sI138 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_func_as_field_value' -tp195 -sI139 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_func_to_sql' -tp196 -sI140 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_alias_field' -tp197 -sI141 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_count_of_slice' -tp198 -sI142 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_distinct' -tp199 -sI143 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_date_field' -tp200 -sI144 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_enum_field' -tp201 -sI145 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_float_field' -tp202 -sI146 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_int_field' -tp203 -sI147 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_null_value' -tp204 -sI148 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_string_field' -tp205 -sI149 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_unicode_string' -tp206 -sI150 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_with_q_objects' -tp207 -sI151 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_final' -tp208 -sI152 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_in_subquery' -tp209 -sI153 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_invalid_filter' -tp210 -sI154 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_invalid_slicing' -tp211 -sI155 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_materialized_field' -tp212 -sI156 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_mixed_filter' -tp213 -sI157 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_multiple_exclude' -tp214 -sI158 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_mutiple_filter' -tp215 -sI159 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_no_filtering' -tp216 -sI160 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_only' -tp217 -sI161 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_order_by' -tp218 -sI162 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_pagination' -tp219 -sI163 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_pagination_invalid_page' -tp220 -sI164 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_pagination_last_page' -tp221 -sI165 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_pagination_with_conditions' -tp222 -sI166 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_prewhere' -tp223 -sI167 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_slicing' -tp224 -sI168 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_truthiness' -tp225 -sI169 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -S'tests.test_readonly' -p226 -S'ReadonlyTestCase.test_create_readonly_table' -tp227 -sI170 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -g226 -S'ReadonlyTestCase.test_drop_readonly_table' -tp228 -sI171 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -g226 -S'ReadonlyTestCase.test_insert_readonly' -tp229 -sI172 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -g226 -S'ReadonlyTestCase.test_nonexisting_readonly_database' -tp230 -sI173 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -g226 -S'ReadonlyTestCase.test_readonly_db_with_default_user' -tp231 -sI174 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -g226 -S'ReadonlyTestCase.test_readonly_db_with_readonly_user' -tp232 -sI175 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_server_errors.py' -S'tests.test_server_errors' -p233 -S'ServerErrorTest.test_new_format' -tp234 -sI176 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_server_errors.py' -g233 -S'ServerErrorTest.test_old_format' -tp235 -sI177 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_simple_fields.py' -S'tests.test_simple_fields' -p236 -S'SimpleFieldsTest.test_date_field' -tp237 -sI178 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_simple_fields.py' -g236 -S'SimpleFieldsTest.test_date_field_timezone' -tp238 -sI179 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_simple_fields.py' -g236 -S'SimpleFieldsTest.test_datetime_field' -tp239 -sI180 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_simple_fields.py' -g236 -S'SimpleFieldsTest.test_datetime_field_timezone' -tp240 -sI181 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_simple_fields.py' -g236 -S'SimpleFieldsTest.test_uint8_field' -tp241 -sI182 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -S'tests.test_system_models' -p242 -S'SystemPartTest.test_attach_detach' -tp243 -sI183 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_drop' -tp244 -sI184 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_fetch' -tp245 -sI185 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_freeze' -tp246 -sI186 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_get_active' -tp247 -sI187 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_get_all' -tp248 -sI188 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_get_conditions' -tp249 -sI189 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_is_read_only' -tp250 -sI190 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_is_system_model' -tp251 -sI191 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_query' -tp252 -sI192 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemTest.test_create_readonly_table' -tp253 -sI193 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemTest.test_drop_readonly_table' -tp254 -sI194 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemTest.test_insert_system' -tp255 -sI195 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_uuid_fields.py' -S'tests.test_uuid_fields' -p256 -S'UUIDFieldsTest.test_uuid_field' -tp257 -ss. \ No newline at end of file diff --git a/README.md b/README.md index 462c8f4..247d928 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Let's jump right in with a simple example of monitoring CPU usage. First we need connect to the database and create a table for the model: ```python -from infi.clickhouse_orm import Database, Model, DateTimeField, UInt16Field, Float32Field, Memory, F +from clickhouse_orm import Database, Model, DateTimeField, UInt16Field, Float32Field, Memory, F class CPUStats(Model): diff --git a/buildout.cfg b/buildout.cfg deleted file mode 100644 index 872c54b..0000000 --- a/buildout.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[buildout] -prefer-final = false -newest = false -download-cache = .cache -develop = . -parts = -relative-paths = true - -[project] -name = infi.clickhouse_orm -company = Infinidat -namespace_packages = ['infi'] -install_requires = [ - 'iso8601 >= 0.1.12', - 'pytz', - 'requests', - 'setuptools' - ] -version_file = src/infi/clickhouse_orm/__version__.py -description = A Python library for working with the ClickHouse database -long_description = A Python library for working with the ClickHouse database -console_scripts = [] -gui_scripts = [] -package_data = [] -upgrade_code = {58530fba-3932-11e6-a20e-7071bc32067f} -product_name = infi.clickhouse_orm -post_install_script_name = None -pre_uninstall_script_name = None -homepage = https://github.com/Infinidat/infi.clickhouse_orm - -[isolated-python] -recipe = infi.recipe.python -version = v3.8.0.2 - -[setup.py] -recipe = infi.recipe.template.version -input = setup.in -output = setup.py - -[__version__.py] -recipe = infi.recipe.template.version -output = ${project:version_file} - -[development-scripts] -dependent-scripts = true -recipe = infi.recipe.console_scripts -eggs = ${project:name} - ipython<6 - nose - coverage - enum-compat - infi.unittest - infi.traceback - memory_profiler - profilehooks - psutil - zc.buildout -scripts = ipython - nosetests -interpreter = python - -[pack] -recipe = infi.recipe.application_packager - -[sublime] -recipe = corneti.recipes.codeintel -eggs = ${development-scripts:eggs} - diff --git a/clickhouse_orm/__init__.py b/clickhouse_orm/__init__.py new file mode 100644 index 0000000..292e25c --- /dev/null +++ b/clickhouse_orm/__init__.py @@ -0,0 +1,13 @@ +__import__("pkg_resources").declare_namespace(__name__) + +from clickhouse_orm.database import * +from clickhouse_orm.engines import * +from clickhouse_orm.fields import * +from clickhouse_orm.funcs import * +from clickhouse_orm.migrations import * +from clickhouse_orm.models import * +from clickhouse_orm.query import * +from clickhouse_orm.system_models import * + +from inspect import isclass +__all__ = [c.__name__ for c in locals().values() if isclass(c)] diff --git a/src/infi/clickhouse_orm/database.py b/clickhouse_orm/database.py similarity index 99% rename from src/infi/clickhouse_orm/database.py rename to clickhouse_orm/database.py index d42e224..9419d7c 100644 --- a/src/infi/clickhouse_orm/database.py +++ b/clickhouse_orm/database.py @@ -249,7 +249,7 @@ class Database(object): - `model_class`: the model to count. - `conditions`: optional SQL conditions (contents of the WHERE clause). ''' - from infi.clickhouse_orm.query import Q + from clickhouse_orm.query import Q query = 'SELECT count() FROM $table' if conditions: if isinstance(conditions, Q): @@ -306,7 +306,7 @@ class Database(object): The result is a namedtuple containing `objects` (list), `number_of_objects`, `pages_total`, `number` (of the current page), and `page_size`. ''' - from infi.clickhouse_orm.query import Q + from clickhouse_orm.query import Q count = self.count(model_class, conditions) pages_total = int(ceil(count / float(page_size))) if page_num == -1: diff --git a/src/infi/clickhouse_orm/engines.py b/clickhouse_orm/engines.py similarity index 99% rename from src/infi/clickhouse_orm/engines.py rename to clickhouse_orm/engines.py index 7fb83be..285a848 100644 --- a/src/infi/clickhouse_orm/engines.py +++ b/clickhouse_orm/engines.py @@ -91,7 +91,7 @@ class MergeTree(Engine): elif not self.date_col: # Can't import it globally due to circular import - from infi.clickhouse_orm.database import DatabaseException + from clickhouse_orm.database import DatabaseException raise DatabaseException("Custom partitioning is not supported before ClickHouse 1.1.54310. " "Please update your server or use date_col syntax." "https://clickhouse.tech/docs/en/table_engines/custom_partitioning_key/") diff --git a/src/infi/clickhouse_orm/fields.py b/clickhouse_orm/fields.py similarity index 100% rename from src/infi/clickhouse_orm/fields.py rename to clickhouse_orm/fields.py diff --git a/src/infi/clickhouse_orm/funcs.py b/clickhouse_orm/funcs.py similarity index 100% rename from src/infi/clickhouse_orm/funcs.py rename to clickhouse_orm/funcs.py diff --git a/src/infi/clickhouse_orm/migrations.py b/clickhouse_orm/migrations.py similarity index 99% rename from src/infi/clickhouse_orm/migrations.py rename to clickhouse_orm/migrations.py index c8c656a..dc37f20 100644 --- a/src/infi/clickhouse_orm/migrations.py +++ b/clickhouse_orm/migrations.py @@ -97,7 +97,7 @@ class AlterTable(ModelOperation): # Identify fields whose type was changed # The order of class attributes can be changed any time, so we can't count on it # Secondly, MATERIALIZED and ALIAS fields are always at the end of the DESC, so we can't expect them to save - # attribute position. Watch https://github.com/Infinidat/infi.clickhouse_orm/issues/47 + # attribute position. Watch https://github.com/Infinidat/clickhouse_orm/issues/47 model_fields = {name: field.get_sql(with_default_expression=False, db=database) for name, field in self.model_class.fields().items()} for field_name, field_sql in self._get_table_fields(database): diff --git a/src/infi/clickhouse_orm/models.py b/clickhouse_orm/models.py similarity index 99% rename from src/infi/clickhouse_orm/models.py rename to clickhouse_orm/models.py index e3f95e3..0fc5e7f 100644 --- a/src/infi/clickhouse_orm/models.py +++ b/clickhouse_orm/models.py @@ -200,7 +200,7 @@ class ModelBase(type): @classmethod def create_ad_hoc_field(cls, db_type): - import infi.clickhouse_orm.fields as orm_fields + import clickhouse_orm.fields as orm_fields # Enums if db_type.startswith('Enum'): return orm_fields.BaseEnumField.create_ad_hoc_field(db_type) diff --git a/src/infi/clickhouse_orm/query.py b/clickhouse_orm/query.py similarity index 99% rename from src/infi/clickhouse_orm/query.py rename to clickhouse_orm/query.py index 92efec4..675c98a 100644 --- a/src/infi/clickhouse_orm/query.py +++ b/clickhouse_orm/query.py @@ -23,7 +23,7 @@ class Operator(object): raise NotImplementedError # pragma: no cover def _value_to_sql(self, field, value, quote=True): - from infi.clickhouse_orm.funcs import F + from clickhouse_orm.funcs import F if isinstance(value, F): return value.to_sql() return field.to_db_string(field.to_python(value, pytz.utc), quote) diff --git a/src/infi/clickhouse_orm/system_models.py b/clickhouse_orm/system_models.py similarity index 100% rename from src/infi/clickhouse_orm/system_models.py rename to clickhouse_orm/system_models.py diff --git a/src/infi/clickhouse_orm/utils.py b/clickhouse_orm/utils.py similarity index 98% rename from src/infi/clickhouse_orm/utils.py rename to clickhouse_orm/utils.py index c0d0325..78701ff 100644 --- a/src/infi/clickhouse_orm/utils.py +++ b/clickhouse_orm/utils.py @@ -48,7 +48,7 @@ def arg_to_sql(arg): Supports functions, model fields, strings, dates, datetimes, timedeltas, booleans, None, numbers, timezones, arrays/iterables. """ - from infi.clickhouse_orm import Field, StringField, DateTimeField, DateField, F, QuerySet + from clickhouse_orm import Field, StringField, DateTimeField, DateField, F, QuerySet if isinstance(arg, F): return arg.to_sql() if isinstance(arg, Field): diff --git a/docs/class_reference.md b/docs/class_reference.md index 08716a5..3d91cdc 100644 --- a/docs/class_reference.md +++ b/docs/class_reference.md @@ -1,7 +1,7 @@ Class Reference =============== -infi.clickhouse_orm.database +clickhouse_orm.database ---------------------------- ### Database @@ -152,7 +152,7 @@ Extends Exception Raised when a database operation fails. -infi.clickhouse_orm.models +clickhouse_orm.models -------------------------- ### Model @@ -811,7 +811,7 @@ separated by non-alphanumeric characters. - `random_seed` — The seed for Bloom filter hash functions. -infi.clickhouse_orm.fields +clickhouse_orm.fields -------------------------- ### ArrayField @@ -1046,7 +1046,7 @@ Extends Field #### UUIDField(default=None, alias=None, materialized=None, readonly=None, codec=None) -infi.clickhouse_orm.engines +clickhouse_orm.engines --------------------------- ### Engine @@ -1140,7 +1140,7 @@ Extends MergeTree #### ReplacingMergeTree(date_col=None, order_by=(), ver_col=None, sampling_expr=None, index_granularity=8192, replica_table_path=None, replica_name=None, partition_key=None, primary_key=None) -infi.clickhouse_orm.query +clickhouse_orm.query ------------------------- ### QuerySet @@ -1443,7 +1443,7 @@ https://clickhouse.tech/docs/en/query_language/select/#with-totals-modifier #### to_sql(model_cls) -infi.clickhouse_orm.funcs +clickhouse_orm.funcs ------------------------- ### F diff --git a/docs/contributing.md b/docs/contributing.md index c173cb9..c46fa0b 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -1,7 +1,7 @@ Contributing ============ -This project is hosted on GitHub - [https://github.com/Infinidat/infi.clickhouse_orm/](https://github.com/Infinidat/infi.clickhouse_orm/). +This project is hosted on GitHub - [https://github.com/Infinidat/clickhouse_orm/](https://github.com/Infinidat/clickhouse_orm/). Please open an issue there if you encounter a bug or want to request a feature. Pull requests are also welcome. @@ -12,7 +12,7 @@ Building After cloning the project, run the following commands: easy_install -U infi.projector - cd infi.clickhouse_orm + cd clickhouse_orm projector devenv build A `setup.py` file will be generated, which you can use to install the development version of the package: @@ -28,7 +28,7 @@ To run the tests, ensure that the ClickHouse server is running on >](class_reference.md) \ No newline at end of file +[<< System Models](system_models.md) | [Table of Contents](toc.md) | [Class Reference >>](class_reference.md) diff --git a/docs/expressions.md b/docs/expressions.md index d9237bd..c339af8 100644 --- a/docs/expressions.md +++ b/docs/expressions.md @@ -13,7 +13,7 @@ Using Expressions Expressions usually include ClickHouse database functions, which are made available by the `F` class. Here's a simple function: ```python -from infi.clickhouse_orm import F +from clickhouse_orm import F expr = F.today() ``` diff --git a/docs/field_options.md b/docs/field_options.md index 3019c98..77d1beb 100644 --- a/docs/field_options.md +++ b/docs/field_options.md @@ -25,7 +25,7 @@ class Event(Model): engine = Memory() ... ``` -When creating a model instance, any fields you do not specify get their default value. Fields that use a default expression are assigned a sentinel value of `infi.clickhouse_orm.utils.NO_VALUE` instead. For example: +When creating a model instance, any fields you do not specify get their default value. Fields that use a default expression are assigned a sentinel value of `clickhouse_orm.utils.NO_VALUE` instead. For example: ```python >>> event = Event() >>> print(event.to_dict()) @@ -63,7 +63,7 @@ db.select('SELECT created, created_date, username, name FROM $db.event', model_c # created_date and username will contain a default value db.select('SELECT * FROM $db.event', model_class=Event) ``` -When creating a model instance, any alias or materialized fields are assigned a sentinel value of `infi.clickhouse_orm.utils.NO_VALUE` since their real values can only be known after insertion to the database. +When creating a model instance, any alias or materialized fields are assigned a sentinel value of `clickhouse_orm.utils.NO_VALUE` since their real values can only be known after insertion to the database. ## codec @@ -109,4 +109,4 @@ This attribute is set automatically for fields with `alias` or `materialized` at --- -[<< Querysets](querysets.md) | [Table of Contents](toc.md) | [Field Types >>](field_types.md) \ No newline at end of file +[<< Querysets](querysets.md) | [Table of Contents](toc.md) | [Field Types >>](field_types.md) diff --git a/docs/field_types.md b/docs/field_types.md index 7613276..b8c16b3 100644 --- a/docs/field_types.md +++ b/docs/field_types.md @@ -166,7 +166,7 @@ For example, we can create a BooleanField which will hold `True` and `False` val Here's the full implementation: ```python -from infi.clickhouse_orm import Field +from clickhouse_orm import Field class BooleanField(Field): diff --git a/docs/importing_orm_classes.md b/docs/importing_orm_classes.md index 77d04e4..13bda0d 100644 --- a/docs/importing_orm_classes.md +++ b/docs/importing_orm_classes.md @@ -7,24 +7,24 @@ The ORM supports different styles of importing and referring to its classes, so Importing Everything -------------------- -It is safe to use `import *` from `infi.clickhouse_orm` or its submodules. Only classes that are needed by users of the ORM will get imported, and nothing else: +It is safe to use `import *` from `clickhouse_orm` or its submodules. Only classes that are needed by users of the ORM will get imported, and nothing else: ```python -from infi.clickhouse_orm import * +from clickhouse_orm import * ``` This is exactly equivalent to the following import statements: ```python -from infi.clickhouse_orm.database import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.funcs import * -from infi.clickhouse_orm.migrations import * -from infi.clickhouse_orm.models import * -from infi.clickhouse_orm.query import * -from infi.clickhouse_orm.system_models import * +from clickhouse_orm.database import * +from clickhouse_orm.engines import * +from clickhouse_orm.fields import * +from clickhouse_orm.funcs import * +from clickhouse_orm.migrations import * +from clickhouse_orm.models import * +from clickhouse_orm.query import * +from clickhouse_orm.system_models import * ``` By importing everything, all of the ORM's public classes can be used directly. For example: ```python -from infi.clickhouse_orm import * +from clickhouse_orm import * class Event(Model): @@ -40,8 +40,8 @@ Importing Everything into a Namespace To prevent potential name clashes and to make the code more readable, you can import the ORM's classes into a namespace of your choosing, e.g. `orm`. For brevity, it is recommended to import the `F` class explicitly: ```python -import infi.clickhouse_orm as orm -from infi.clickhouse_orm import F +import clickhouse_orm as orm +from clickhouse_orm import F class Event(orm.Model): @@ -57,7 +57,7 @@ Importing Specific Submodules It is possible to import only the submodules you need, and use their names to qualify the ORM's class names. This option is more verbose, but makes it clear where each class comes from. For example: ```python -from infi.clickhouse_orm import models, fields, engines, F +from clickhouse_orm import models, fields, engines, F class Event(models.Model): @@ -71,9 +71,9 @@ class Event(models.Model): Importing Specific Classes -------------------------- -If you prefer, you can import only the specific ORM classes that you need directly from `infi.clickhouse_orm`: +If you prefer, you can import only the specific ORM classes that you need directly from `clickhouse_orm`: ```python -from infi.clickhouse_orm import Model, StringField, UInt32Field, DateTimeField, F, Memory +from clickhouse_orm import Model, StringField, UInt32Field, DateTimeField, F, Memory class Event(Model): diff --git a/docs/index.md b/docs/index.md index db75910..a19d21a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,10 +8,10 @@ Version 1.x supports Python 2.7 and 3.5+. Version 2.x dropped support for Python Installation ------------ -To install infi.clickhouse_orm: +To install clickhouse_orm: - pip install infi.clickhouse_orm + pip install clickhouse_orm --- -[Table of Contents](toc.md) | [Models and Databases >>](models_and_databases.md) \ No newline at end of file +[Table of Contents](toc.md) | [Models and Databases >>](models_and_databases.md) diff --git a/docs/models_and_databases.md b/docs/models_and_databases.md index 28ab6ad..06790ef 100644 --- a/docs/models_and_databases.md +++ b/docs/models_and_databases.md @@ -10,7 +10,7 @@ Defining Models Models are defined in a way reminiscent of Django's ORM, by subclassing `Model`: ```python -from infi.clickhouse_orm import Model, StringField, DateField, Float32Field, MergeTree +from clickhouse_orm import Model, StringField, DateField, Float32Field, MergeTree class Person(Model): @@ -133,7 +133,7 @@ Inserting to the Database To write your instances to ClickHouse, you need a `Database` instance: - from infi.clickhouse_orm import Database + from clickhouse_orm import Database db = Database('my_test_db') @@ -247,4 +247,4 @@ Note that `order_by` must be chosen so that the ordering is unique, otherwise th --- -[<< Overview](index.md) | [Table of Contents](toc.md) | [Expressions >>](expressions.md) \ No newline at end of file +[<< Overview](index.md) | [Table of Contents](toc.md) | [Expressions >>](expressions.md) diff --git a/docs/ref.md b/docs/ref.md index 4679b2b..6b513ad 100644 --- a/docs/ref.md +++ b/docs/ref.md @@ -1,7 +1,7 @@ Class Reference =============== -infi.clickhouse_orm.database +clickhouse_orm.database ---------------------------- ### Database @@ -104,7 +104,7 @@ Extends Exception Raised when a database operation fails. -infi.clickhouse_orm.models +clickhouse_orm.models -------------------------- ### Model @@ -263,7 +263,7 @@ Returns the instance's column values as a tab-separated line. A newline is not i - `include_readonly`: if false, returns only fields that can be inserted into database. -infi.clickhouse_orm.fields +clickhouse_orm.fields -------------------------- ### Field @@ -419,7 +419,7 @@ Extends BaseEnumField #### Enum16Field(enum_cls, default=None, alias=None, materialized=None) -infi.clickhouse_orm.engines +clickhouse_orm.engines --------------------------- ### Engine @@ -474,7 +474,7 @@ Extends MergeTree #### ReplacingMergeTree(date_col, key_cols, ver_col=None, sampling_expr=None, index_granularity=8192, replica_table_path=None, replica_name=None) -infi.clickhouse_orm.query +clickhouse_orm.query ------------------------- ### QuerySet diff --git a/docs/schema_migrations.md b/docs/schema_migrations.md index 9e3fa01..cb8d4f1 100644 --- a/docs/schema_migrations.md +++ b/docs/schema_migrations.md @@ -22,7 +22,7 @@ To write migrations, create a Python package. Then create a python file for the Each migration file is expected to contain a list of `operations`, for example: - from infi.clickhouse_orm import migrations + from clickhouse_orm import migrations from analytics import models operations = [ @@ -109,4 +109,4 @@ Note that you may have more than one migrations package. --- -[<< Table Engines](table_engines.md) | [Table of Contents](toc.md) | [System Models >>](system_models.md) \ No newline at end of file +[<< Table Engines](table_engines.md) | [Table of Contents](toc.md) | [System Models >>](system_models.md) diff --git a/docs/system_models.md b/docs/system_models.md index 01979b3..214dba1 100644 --- a/docs/system_models.md +++ b/docs/system_models.md @@ -30,7 +30,7 @@ A partition in a table is data for a single calendar month. Table "system.parts" Usage example: - from infi.clickhouse_orm import Database, SystemPart + from clickhouse_orm import Database, SystemPart db = Database('my_test_db', db_url='http://192.168.1.1:8050', username='scott', password='tiger') partitions = SystemPart.get_active(db, conditions='') # Getting all active partitions of the database if len(partitions) > 0: @@ -43,4 +43,4 @@ Usage example: --- -[<< Schema Migrations](schema_migrations.md) | [Table of Contents](toc.md) | [Contributing >>](contributing.md) \ No newline at end of file +[<< Schema Migrations](schema_migrations.md) | [Table of Contents](toc.md) | [Contributing >>](contributing.md) diff --git a/docs/toc.md b/docs/toc.md index 2fd878f..e973772 100644 --- a/docs/toc.md +++ b/docs/toc.md @@ -78,17 +78,17 @@ * [Tests](contributing.md#tests) * [Class Reference](class_reference.md#class-reference) - * [infi.clickhouse_orm.database](class_reference.md#inficlickhouse_ormdatabase) + * [clickhouse_orm.database](class_reference.md#inficlickhouse_ormdatabase) * [Database](class_reference.md#database) * [DatabaseException](class_reference.md#databaseexception) - * [infi.clickhouse_orm.models](class_reference.md#inficlickhouse_ormmodels) + * [clickhouse_orm.models](class_reference.md#inficlickhouse_ormmodels) * [Model](class_reference.md#model) * [BufferModel](class_reference.md#buffermodel) * [MergeModel](class_reference.md#mergemodel) * [DistributedModel](class_reference.md#distributedmodel) * [Constraint](class_reference.md#constraint) * [Index](class_reference.md#index) - * [infi.clickhouse_orm.fields](class_reference.md#inficlickhouse_ormfields) + * [clickhouse_orm.fields](class_reference.md#inficlickhouse_ormfields) * [ArrayField](class_reference.md#arrayfield) * [BaseEnumField](class_reference.md#baseenumfield) * [BaseFloatField](class_reference.md#basefloatfield) @@ -120,7 +120,7 @@ * [UInt64Field](class_reference.md#uint64field) * [UInt8Field](class_reference.md#uint8field) * [UUIDField](class_reference.md#uuidfield) - * [infi.clickhouse_orm.engines](class_reference.md#inficlickhouse_ormengines) + * [clickhouse_orm.engines](class_reference.md#inficlickhouse_ormengines) * [Engine](class_reference.md#engine) * [TinyLog](class_reference.md#tinylog) * [Log](class_reference.md#log) @@ -132,10 +132,10 @@ * [CollapsingMergeTree](class_reference.md#collapsingmergetree) * [SummingMergeTree](class_reference.md#summingmergetree) * [ReplacingMergeTree](class_reference.md#replacingmergetree) - * [infi.clickhouse_orm.query](class_reference.md#inficlickhouse_ormquery) + * [clickhouse_orm.query](class_reference.md#inficlickhouse_ormquery) * [QuerySet](class_reference.md#queryset) * [AggregateQuerySet](class_reference.md#aggregatequeryset) * [Q](class_reference.md#q) - * [infi.clickhouse_orm.funcs](class_reference.md#inficlickhouse_ormfuncs) + * [clickhouse_orm.funcs](class_reference.md#inficlickhouse_ormfuncs) * [F](class_reference.md#f) diff --git a/docs/whats_new_in_version_2.md b/docs/whats_new_in_version_2.md index 378adca..df8a77c 100644 --- a/docs/whats_new_in_version_2.md +++ b/docs/whats_new_in_version_2.md @@ -50,9 +50,9 @@ for row in QueryLog.objects_in(db).filter(QueryLog.query_duration_ms > 10000): ## Convenient ways to import ORM classes -You can now import all ORM classes directly from `infi.clickhouse_orm`, without worrying about sub-modules. For example: +You can now import all ORM classes directly from `clickhouse_orm`, without worrying about sub-modules. For example: ```python -from infi.clickhouse_orm import Database, Model, StringField, DateTimeField, MergeTree +from clickhouse_orm import Database, Model, StringField, DateTimeField, MergeTree ``` See [Importing ORM Classes](importing_orm_classes.md). diff --git a/examples/cpu_usage/collect.py b/examples/cpu_usage/collect.py index 34ee5b4..62102ac 100644 --- a/examples/cpu_usage/collect.py +++ b/examples/cpu_usage/collect.py @@ -1,5 +1,5 @@ import psutil, time, datetime -from infi.clickhouse_orm import Database +from clickhouse_orm import Database from models import CPUStats diff --git a/examples/cpu_usage/models.py b/examples/cpu_usage/models.py index c19007a..fe9afc6 100644 --- a/examples/cpu_usage/models.py +++ b/examples/cpu_usage/models.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import Model, DateTimeField, UInt16Field, Float32Field, Memory +from clickhouse_orm import Model, DateTimeField, UInt16Field, Float32Field, Memory class CPUStats(Model): diff --git a/examples/cpu_usage/requirements.txt b/examples/cpu_usage/requirements.txt index 5e08b8f..4890efc 100644 --- a/examples/cpu_usage/requirements.txt +++ b/examples/cpu_usage/requirements.txt @@ -1,2 +1,2 @@ -infi.clickhouse_orm +clickhouse_orm psutil diff --git a/examples/cpu_usage/results.py b/examples/cpu_usage/results.py index 80b892f..06ee1f0 100644 --- a/examples/cpu_usage/results.py +++ b/examples/cpu_usage/results.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import Database, F +from clickhouse_orm import Database, F from models import CPUStats diff --git a/examples/db_explorer/requirements.txt b/examples/db_explorer/requirements.txt index 8dee9f8..80447d7 100644 --- a/examples/db_explorer/requirements.txt +++ b/examples/db_explorer/requirements.txt @@ -3,7 +3,7 @@ chardet==3.0.4 click==7.1.2 Flask==1.1.2 idna==2.9 -infi.clickhouse-orm==2.0.1 +clickhouse-orm==2.0.1 iso8601==0.1.12 itsdangerous==1.1.0 Jinja2==2.11.2 diff --git a/examples/db_explorer/server.py b/examples/db_explorer/server.py index 6241ed9..9fbcc03 100644 --- a/examples/db_explorer/server.py +++ b/examples/db_explorer/server.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import Database, F +from clickhouse_orm import Database, F from charts import tables_piechart, columns_piechart, number_formatter, bytes_formatter from flask import Flask from flask import render_template diff --git a/examples/full_text_search/load.py b/examples/full_text_search/load.py index 7cf43b0..51564f4 100644 --- a/examples/full_text_search/load.py +++ b/examples/full_text_search/load.py @@ -2,7 +2,7 @@ import sys import nltk from nltk.stem.porter import PorterStemmer from glob import glob -from infi.clickhouse_orm import Database +from clickhouse_orm import Database from models import Fragment diff --git a/examples/full_text_search/models.py b/examples/full_text_search/models.py index 130fe83..80de2b7 100644 --- a/examples/full_text_search/models.py +++ b/examples/full_text_search/models.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import * +from clickhouse_orm import * class Fragment(Model): diff --git a/examples/full_text_search/requirements.txt b/examples/full_text_search/requirements.txt index 6d2f877..d157381 100644 --- a/examples/full_text_search/requirements.txt +++ b/examples/full_text_search/requirements.txt @@ -1,4 +1,4 @@ -infi.clickhouse_orm +clickhouse_orm nltk requests colorama diff --git a/examples/full_text_search/search.py b/examples/full_text_search/search.py index ff5fcea..c4d0918 100644 --- a/examples/full_text_search/search.py +++ b/examples/full_text_search/search.py @@ -1,7 +1,7 @@ import sys from colorama import init, Fore, Back, Style from nltk.stem.porter import PorterStemmer -from infi.clickhouse_orm import Database, F +from clickhouse_orm import Database, F from models import Fragment from load import trim_punctuation diff --git a/scripts/generate_ref.py b/scripts/generate_ref.py index 22850ab..16473b4 100644 --- a/scripts/generate_ref.py +++ b/scripts/generate_ref.py @@ -120,13 +120,13 @@ def all_subclasses(cls): if __name__ == '__main__': - from infi.clickhouse_orm import database - from infi.clickhouse_orm import fields - from infi.clickhouse_orm import engines - from infi.clickhouse_orm import models - from infi.clickhouse_orm import query - from infi.clickhouse_orm import funcs - from infi.clickhouse_orm import system_models + from clickhouse_orm import database + from clickhouse_orm import fields + from clickhouse_orm import engines + from clickhouse_orm import models + from clickhouse_orm import query + from clickhouse_orm import funcs + from clickhouse_orm import system_models print('Class Reference') print('===============') diff --git a/scripts/test_python3.sh b/scripts/test_python3.sh index 86016cd..455d5b7 100755 --- a/scripts/test_python3.sh +++ b/scripts/test_python3.sh @@ -5,7 +5,7 @@ virtualenv -p python3 /tmp/orm_env cd /tmp/orm_env source bin/activate pip install infi.projector -git clone https://github.com/Infinidat/infi.clickhouse_orm.git -cd infi.clickhouse_orm +git clone https://github.com/Infinidat/clickhouse_orm.git +cd clickhouse_orm projector devenv build bin/nosetests diff --git a/src/infi/__init__.py b/src/infi/__init__.py deleted file mode 100644 index 5284146..0000000 --- a/src/infi/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/infi/clickhouse_orm/__init__.py b/src/infi/clickhouse_orm/__init__.py deleted file mode 100644 index c7982cc..0000000 --- a/src/infi/clickhouse_orm/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) - -from infi.clickhouse_orm.database import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.funcs import * -from infi.clickhouse_orm.migrations import * -from infi.clickhouse_orm.models import * -from infi.clickhouse_orm.query import * -from infi.clickhouse_orm.system_models import * - -from inspect import isclass -__all__ = [c.__name__ for c in locals().values() if isclass(c)] diff --git a/tests/base_test_with_data.py b/tests/base_test_with_data.py index 53d2343..f48d11b 100644 --- a/tests/base_test_with_data.py +++ b/tests/base_test_with_data.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- import unittest -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * import logging logging.getLogger("requests").setLevel(logging.WARNING) diff --git a/tests/sample_migrations/0001_initial.py b/tests/sample_migrations/0001_initial.py index a289d86..c06bac9 100644 --- a/tests/sample_migrations/0001_initial.py +++ b/tests/sample_migrations/0001_initial.py @@ -1,6 +1,6 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ migrations.CreateTable(Model1) -] \ No newline at end of file +] diff --git a/tests/sample_migrations/0002.py b/tests/sample_migrations/0002.py index 6e4e0d9..2904c12 100644 --- a/tests/sample_migrations/0002.py +++ b/tests/sample_migrations/0002.py @@ -1,6 +1,6 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ migrations.DropTable(Model1) -] \ No newline at end of file +] diff --git a/tests/sample_migrations/0003.py b/tests/sample_migrations/0003.py index a289d86..c06bac9 100644 --- a/tests/sample_migrations/0003.py +++ b/tests/sample_migrations/0003.py @@ -1,6 +1,6 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ migrations.CreateTable(Model1) -] \ No newline at end of file +] diff --git a/tests/sample_migrations/0004.py b/tests/sample_migrations/0004.py index 6d10205..7a3322d 100644 --- a/tests/sample_migrations/0004.py +++ b/tests/sample_migrations/0004.py @@ -1,6 +1,6 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ migrations.AlterTable(Model2) -] \ No newline at end of file +] diff --git a/tests/sample_migrations/0005.py b/tests/sample_migrations/0005.py index f2633ef..95e1950 100644 --- a/tests/sample_migrations/0005.py +++ b/tests/sample_migrations/0005.py @@ -1,6 +1,6 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ migrations.AlterTable(Model3) -] \ No newline at end of file +] diff --git a/tests/sample_migrations/0006.py b/tests/sample_migrations/0006.py index fefb325..cb8299b 100644 --- a/tests/sample_migrations/0006.py +++ b/tests/sample_migrations/0006.py @@ -1,6 +1,6 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ migrations.CreateTable(EnumModel1) -] \ No newline at end of file +] diff --git a/tests/sample_migrations/0007.py b/tests/sample_migrations/0007.py index da23040..1db30f7 100644 --- a/tests/sample_migrations/0007.py +++ b/tests/sample_migrations/0007.py @@ -1,6 +1,6 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ migrations.AlterTable(EnumModel2) -] \ No newline at end of file +] diff --git a/tests/sample_migrations/0008.py b/tests/sample_migrations/0008.py index 691a762..5631567 100644 --- a/tests/sample_migrations/0008.py +++ b/tests/sample_migrations/0008.py @@ -1,6 +1,6 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ migrations.CreateTable(MaterializedModel) -] \ No newline at end of file +] diff --git a/tests/sample_migrations/0009.py b/tests/sample_migrations/0009.py index 7841f17..22b53a0 100644 --- a/tests/sample_migrations/0009.py +++ b/tests/sample_migrations/0009.py @@ -1,6 +1,6 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ migrations.CreateTable(AliasModel) -] \ No newline at end of file +] diff --git a/tests/sample_migrations/0010.py b/tests/sample_migrations/0010.py index 3892583..c01c00a 100644 --- a/tests/sample_migrations/0010.py +++ b/tests/sample_migrations/0010.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0011.py b/tests/sample_migrations/0011.py index dd9d09e..0d88556 100644 --- a/tests/sample_migrations/0011.py +++ b/tests/sample_migrations/0011.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0012.py b/tests/sample_migrations/0012.py index 1dfe3bf..0120a5c 100644 --- a/tests/sample_migrations/0012.py +++ b/tests/sample_migrations/0012.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations operations = [ migrations.RunSQL("INSERT INTO `mig` (date, f1, f3, f4) VALUES ('2016-01-01', 1, 1, 'test') "), diff --git a/tests/sample_migrations/0013.py b/tests/sample_migrations/0013.py index 5ee6498..8bb39b9 100644 --- a/tests/sample_migrations/0013.py +++ b/tests/sample_migrations/0013.py @@ -1,6 +1,6 @@ import datetime -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from test_migrations import Model3 @@ -12,4 +12,4 @@ def forward(database): operations = [ migrations.RunPython(forward) -] \ No newline at end of file +] diff --git a/tests/sample_migrations/0014.py b/tests/sample_migrations/0014.py index 14553f3..7cbcc32 100644 --- a/tests/sample_migrations/0014.py +++ b/tests/sample_migrations/0014.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0015.py b/tests/sample_migrations/0015.py index be1d378..de75d76 100644 --- a/tests/sample_migrations/0015.py +++ b/tests/sample_migrations/0015.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0016.py b/tests/sample_migrations/0016.py index 6f0f814..21387d1 100644 --- a/tests/sample_migrations/0016.py +++ b/tests/sample_migrations/0016.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0017.py b/tests/sample_migrations/0017.py index 4151189..1a1089c 100644 --- a/tests/sample_migrations/0017.py +++ b/tests/sample_migrations/0017.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0018.py b/tests/sample_migrations/0018.py index c34c137..97f52a5 100644 --- a/tests/sample_migrations/0018.py +++ b/tests/sample_migrations/0018.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/sample_migrations/0019.py b/tests/sample_migrations/0019.py index 67ba244..ede957f 100644 --- a/tests/sample_migrations/0019.py +++ b/tests/sample_migrations/0019.py @@ -1,4 +1,4 @@ -from infi.clickhouse_orm import migrations +from clickhouse_orm import migrations from ..test_migrations import * operations = [ diff --git a/tests/test_alias_fields.py b/tests/test_alias_fields.py index 0039fa6..8ddcc3c 100644 --- a/tests/test_alias_fields.py +++ b/tests/test_alias_fields.py @@ -1,11 +1,11 @@ import unittest from datetime import date -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model, NO_VALUE -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.funcs import F +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model, NO_VALUE +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.funcs import F class AliasFieldsTest(unittest.TestCase): diff --git a/tests/test_array_fields.py b/tests/test_array_fields.py index b0b18a2..20972be 100644 --- a/tests/test_array_fields.py +++ b/tests/test_array_fields.py @@ -1,10 +1,10 @@ import unittest from datetime import date -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * class ArrayFieldsTest(unittest.TestCase): @@ -47,7 +47,7 @@ class ArrayFieldsTest(unittest.TestCase): instance.arr_int = value def test_parse_array(self): - from infi.clickhouse_orm.utils import parse_array, unescape + from clickhouse_orm.utils import parse_array, unescape self.assertEqual(parse_array("[]"), []) self.assertEqual(parse_array("[1, 2, 395, -44]"), ["1", "2", "395", "-44"]) self.assertEqual(parse_array("['big','mouse','','!']"), ["big", "mouse", "", "!"]) diff --git a/tests/test_buffer.py b/tests/test_buffer.py index 14cc59a..71dafea 100644 --- a/tests/test_buffer.py +++ b/tests/test_buffer.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import unittest -from infi.clickhouse_orm.models import BufferModel -from infi.clickhouse_orm.engines import * +from clickhouse_orm.models import BufferModel +from clickhouse_orm.engines import * from .base_test_with_data import * diff --git a/tests/test_compressed_fields.py b/tests/test_compressed_fields.py index 8d17571..828a57c 100644 --- a/tests/test_compressed_fields.py +++ b/tests/test_compressed_fields.py @@ -2,11 +2,11 @@ import unittest import datetime import pytz -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model, NO_VALUE -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.utils import parse_tsv +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model, NO_VALUE +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.utils import parse_tsv class CompressedFieldsTestCase(unittest.TestCase): @@ -120,4 +120,4 @@ class CompressedModel(Model): float_field = Float32Field(codec='NONE') alias_field = Float32Field(alias='float_field', codec='ZSTD(4)') - engine = MergeTree('datetime_field', ('uint64_field', 'datetime_field')) \ No newline at end of file + engine = MergeTree('datetime_field', ('uint64_field', 'datetime_field')) diff --git a/tests/test_constraints.py b/tests/test_constraints.py index 1b5892d..b66b54a 100644 --- a/tests/test_constraints.py +++ b/tests/test_constraints.py @@ -1,6 +1,6 @@ import unittest -from infi.clickhouse_orm import * +from clickhouse_orm import * from .base_test_with_data import Person diff --git a/tests/test_custom_fields.py b/tests/test_custom_fields.py index 641da27..fee6730 100644 --- a/tests/test_custom_fields.py +++ b/tests/test_custom_fields.py @@ -1,8 +1,8 @@ import unittest -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.fields import Field, Int16Field -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.engines import Memory +from clickhouse_orm.database import Database +from clickhouse_orm.fields import Field, Int16Field +from clickhouse_orm.models import Model +from clickhouse_orm.engines import Memory class CustomFieldsTest(unittest.TestCase): diff --git a/tests/test_database.py b/tests/test_database.py index 38681d4..d66e23c 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -2,12 +2,12 @@ import unittest import datetime -from infi.clickhouse_orm.database import ServerError, DatabaseException -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.engines import Memory -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.funcs import F -from infi.clickhouse_orm.query import Q +from clickhouse_orm.database import ServerError, DatabaseException +from clickhouse_orm.models import Model +from clickhouse_orm.engines import Memory +from clickhouse_orm.fields import * +from clickhouse_orm.funcs import F +from clickhouse_orm.query import Q from .base_test_with_data import * @@ -248,7 +248,7 @@ class DatabaseTestCase(TestCaseWithData): def test_create_ad_hoc_field(self): # Tests that create_ad_hoc_field works for all column types in the database - from infi.clickhouse_orm.models import ModelBase + from clickhouse_orm.models import ModelBase query = "SELECT DISTINCT type FROM system.columns" for row in self.database.select(query): ModelBase.create_ad_hoc_field(row.type) diff --git a/tests/test_datetime_fields.py b/tests/test_datetime_fields.py index 6c30ffb..a8783bf 100644 --- a/tests/test_datetime_fields.py +++ b/tests/test_datetime_fields.py @@ -2,10 +2,10 @@ import unittest import datetime import pytz -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * class DateFieldsTest(unittest.TestCase): diff --git a/tests/test_decimal_fields.py b/tests/test_decimal_fields.py index 622c6d6..f26fe26 100644 --- a/tests/test_decimal_fields.py +++ b/tests/test_decimal_fields.py @@ -2,10 +2,10 @@ import unittest from decimal import Decimal -from infi.clickhouse_orm.database import Database, ServerError -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database, ServerError +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * class DecimalFieldsTest(unittest.TestCase): diff --git a/tests/test_dictionaries.py b/tests/test_dictionaries.py index 7da4160..40bead6 100644 --- a/tests/test_dictionaries.py +++ b/tests/test_dictionaries.py @@ -1,7 +1,7 @@ import unittest import logging -from infi.clickhouse_orm import * +from clickhouse_orm import * class DictionaryTestMixin: diff --git a/tests/test_engines.py b/tests/test_engines.py index 2fcc8c2..77781df 100644 --- a/tests/test_engines.py +++ b/tests/test_engines.py @@ -1,7 +1,7 @@ import unittest import datetime -from infi.clickhouse_orm import * +from clickhouse_orm import * import logging logging.getLogger("requests").setLevel(logging.WARNING) diff --git a/tests/test_enum_fields.py b/tests/test_enum_fields.py index 9ad4cdb..f53ce69 100644 --- a/tests/test_enum_fields.py +++ b/tests/test_enum_fields.py @@ -1,9 +1,9 @@ import unittest -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * from enum import Enum diff --git a/tests/test_fixed_string_fields.py b/tests/test_fixed_string_fields.py index a29f3ca..6b548a1 100644 --- a/tests/test_fixed_string_fields.py +++ b/tests/test_fixed_string_fields.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- import unittest -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * class FixedStringFieldsTest(unittest.TestCase): diff --git a/tests/test_funcs.py b/tests/test_funcs.py index a262e83..fb250e6 100644 --- a/tests/test_funcs.py +++ b/tests/test_funcs.py @@ -7,9 +7,9 @@ from ipaddress import IPv4Address, IPv6Address import logging from decimal import Decimal -from infi.clickhouse_orm.database import ServerError -from infi.clickhouse_orm.utils import NO_VALUE -from infi.clickhouse_orm.funcs import F +from clickhouse_orm.database import ServerError +from clickhouse_orm.utils import NO_VALUE +from clickhouse_orm.funcs import F class FuncsTestCase(TestCaseWithData): diff --git a/tests/test_indexes.py b/tests/test_indexes.py index 0dccaea..63ce7c3 100644 --- a/tests/test_indexes.py +++ b/tests/test_indexes.py @@ -1,6 +1,6 @@ import unittest -from infi.clickhouse_orm import * +from clickhouse_orm import * class IndexesTest(unittest.TestCase): diff --git a/tests/test_inheritance.py b/tests/test_inheritance.py index 705a9b7..e15899f 100644 --- a/tests/test_inheritance.py +++ b/tests/test_inheritance.py @@ -2,10 +2,10 @@ import unittest import datetime import pytz -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * class InheritanceTestCase(unittest.TestCase): diff --git a/tests/test_ip_fields.py b/tests/test_ip_fields.py index 220aa1b..34301df 100644 --- a/tests/test_ip_fields.py +++ b/tests/test_ip_fields.py @@ -1,9 +1,9 @@ import unittest from ipaddress import IPv4Address, IPv6Address -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.fields import Int16Field, IPv4Field, IPv6Field -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.engines import Memory +from clickhouse_orm.database import Database +from clickhouse_orm.fields import Int16Field, IPv4Field, IPv6Field +from clickhouse_orm.models import Model +from clickhouse_orm.engines import Memory class IPFieldsTest(unittest.TestCase): diff --git a/tests/test_join.py b/tests/test_join.py index 48da1b3..b00c523 100644 --- a/tests/test_join.py +++ b/tests/test_join.py @@ -2,7 +2,7 @@ import unittest import json -from infi.clickhouse_orm import database, engines, fields, models +from clickhouse_orm import database, engines, fields, models class JoinTest(unittest.TestCase): diff --git a/tests/test_materialized_fields.py b/tests/test_materialized_fields.py index 8893229..93a9ee0 100644 --- a/tests/test_materialized_fields.py +++ b/tests/test_materialized_fields.py @@ -1,11 +1,11 @@ import unittest from datetime import date -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model, NO_VALUE -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.funcs import F +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model, NO_VALUE +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.funcs import F class MaterializedFieldsTest(unittest.TestCase): diff --git a/tests/test_migrations.py b/tests/test_migrations.py index d00357a..faaf4e5 100644 --- a/tests/test_migrations.py +++ b/tests/test_migrations.py @@ -1,10 +1,10 @@ import unittest -from infi.clickhouse_orm.database import Database, ServerError -from infi.clickhouse_orm.models import Model, BufferModel, Constraint, Index -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.migrations import MigrationHistory +from clickhouse_orm.database import Database, ServerError +from clickhouse_orm.models import Model, BufferModel, Constraint, Index +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.migrations import MigrationHistory from enum import Enum # Add tests to path so that migrations will be importable diff --git a/tests/test_models.py b/tests/test_models.py index 579c2dd..10d8b77 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -2,10 +2,10 @@ import unittest import datetime import pytz -from infi.clickhouse_orm.models import Model, NO_VALUE -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.funcs import F +from clickhouse_orm.models import Model, NO_VALUE +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.funcs import F class ModelTestCase(unittest.TestCase): diff --git a/tests/test_mutations.py b/tests/test_mutations.py index 874c7bd..ec291b9 100644 --- a/tests/test_mutations.py +++ b/tests/test_mutations.py @@ -1,5 +1,5 @@ import unittest -from infi.clickhouse_orm import F +from clickhouse_orm import F from .base_test_with_data import * from time import sleep diff --git a/tests/test_nullable_fields.py b/tests/test_nullable_fields.py index ab7a777..a0357ac 100644 --- a/tests/test_nullable_fields.py +++ b/tests/test_nullable_fields.py @@ -1,11 +1,11 @@ import unittest import pytz -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.utils import comma_join +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.utils import comma_join from datetime import date, datetime diff --git a/tests/test_querysets.py b/tests/test_querysets.py index 7f161e0..6f7116c 100644 --- a/tests/test_querysets.py +++ b/tests/test_querysets.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import unittest -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.query import Q -from infi.clickhouse_orm.funcs import F +from clickhouse_orm.database import Database +from clickhouse_orm.query import Q +from clickhouse_orm.funcs import F from .base_test_with_data import * from datetime import date, datetime from enum import Enum diff --git a/tests/test_readonly.py b/tests/test_readonly.py index bc9b252..e136b9a 100644 --- a/tests/test_readonly.py +++ b/tests/test_readonly.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from infi.clickhouse_orm.database import DatabaseException, ServerError +from clickhouse_orm.database import DatabaseException, ServerError from .base_test_with_data import * diff --git a/tests/test_server_errors.py b/tests/test_server_errors.py index 60fbd2b..578ae9d 100644 --- a/tests/test_server_errors.py +++ b/tests/test_server_errors.py @@ -1,6 +1,6 @@ import unittest -from infi.clickhouse_orm.database import ServerError +from clickhouse_orm.database import ServerError class ServerErrorTest(unittest.TestCase): diff --git a/tests/test_simple_fields.py b/tests/test_simple_fields.py index 247e096..d87dcbc 100644 --- a/tests/test_simple_fields.py +++ b/tests/test_simple_fields.py @@ -1,5 +1,5 @@ import unittest -from infi.clickhouse_orm.fields import * +from clickhouse_orm.fields import * from datetime import date, datetime import pytz diff --git a/tests/test_system_models.py b/tests/test_system_models.py index 5d3a862..77a2b78 100644 --- a/tests/test_system_models.py +++ b/tests/test_system_models.py @@ -3,11 +3,11 @@ from datetime import date import os -from infi.clickhouse_orm.database import Database, DatabaseException -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.system_models import SystemPart +from clickhouse_orm.database import Database, DatabaseException +from clickhouse_orm.engines import * +from clickhouse_orm.fields import * +from clickhouse_orm.models import Model +from clickhouse_orm.system_models import SystemPart class SystemTest(unittest.TestCase): diff --git a/tests/test_uuid_fields.py b/tests/test_uuid_fields.py index 284d8f5..90e5acd 100644 --- a/tests/test_uuid_fields.py +++ b/tests/test_uuid_fields.py @@ -1,9 +1,9 @@ import unittest from uuid import UUID -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.fields import Int16Field, UUIDField -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.engines import Memory +from clickhouse_orm.database import Database +from clickhouse_orm.fields import Int16Field, UUIDField +from clickhouse_orm.models import Model +from clickhouse_orm.engines import Memory class UUIDFieldsTest(unittest.TestCase):