Rename orm module to om
This commit is contained in:
		
							parent
							
								
									62240723ca
								
							
						
					
					
						commit
						2bd71ff087
					
				
					 7 changed files with 11 additions and 15 deletions
				
			
		| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
import click
 | 
					import click
 | 
				
			||||||
from redis_developer.om.migrations.migrator import Migrator
 | 
					from redis_developer.model.migrations.migrator import Migrator
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@click.command()
 | 
					@click.command()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,7 +7,7 @@ from typing import Optional
 | 
				
			||||||
from redis import ResponseError
 | 
					from redis import ResponseError
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from redis_developer.connections import get_redis_connection
 | 
					from redis_developer.connections import get_redis_connection
 | 
				
			||||||
from redis_developer.om.model import model_registry
 | 
					from redis_developer.model.model import model_registry
 | 
				
			||||||
 | 
					
 | 
				
			||||||
redis = get_redis_connection()
 | 
					redis = get_redis_connection()
 | 
				
			||||||
log = logging.getLogger(__name__)
 | 
					log = logging.getLogger(__name__)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
import abc
 | 
					import abc
 | 
				
			||||||
from typing import Optional
 | 
					from typing import Optional
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from redis_developer.om.model import JsonModel, HashModel
 | 
					from redis_developer.model.model import JsonModel, HashModel
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class BaseJsonModel(JsonModel, abc.ABC):
 | 
					class BaseJsonModel(JsonModel, abc.ABC):
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
from collections import Sequence
 | 
					from collections import Sequence
 | 
				
			||||||
from typing import Any, Dict, Mapping, Union, List
 | 
					from typing import Any, Dict, Mapping, Union, List
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from redis_developer.om.model import Expression
 | 
					from redis_developer.model.model import Expression
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class LogicalOperatorForListOfExpressions(Expression):
 | 
					class LogicalOperatorForListOfExpressions(Expression):
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,7 @@ import pytest
 | 
				
			||||||
from redis import Redis
 | 
					from redis import Redis
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from redis_developer.connections import get_redis_connection
 | 
					from redis_developer.connections import get_redis_connection
 | 
				
			||||||
from redis_developer.orm.migrations.migrator import Migrator
 | 
					from redis_developer.model.migrations.migrator import Migrator
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@pytest.fixture(scope="module", autouse=True)
 | 
					@pytest.fixture(scope="module", autouse=True)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,11 +8,11 @@ import pytest
 | 
				
			||||||
import redis
 | 
					import redis
 | 
				
			||||||
from pydantic import ValidationError
 | 
					from pydantic import ValidationError
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from redis_developer.orm import (
 | 
					from redis_developer.model import (
 | 
				
			||||||
    HashModel,
 | 
					    HashModel,
 | 
				
			||||||
    Field,
 | 
					    Field,
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
from redis_developer.orm.model import RedisModelError, QueryNotSupportedError, NotFoundError
 | 
					from redis_developer.model.model import RedisModelError, QueryNotSupportedError, NotFoundError
 | 
				
			||||||
 | 
					
 | 
				
			||||||
r = redis.Redis()
 | 
					r = redis.Redis()
 | 
				
			||||||
today = datetime.date.today()
 | 
					today = datetime.date.today()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,12 +8,13 @@ import pytest
 | 
				
			||||||
import redis
 | 
					import redis
 | 
				
			||||||
from pydantic import ValidationError
 | 
					from pydantic import ValidationError
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from redis_developer.orm import (
 | 
					from redis_developer.model import (
 | 
				
			||||||
 | 
					    EmbeddedJsonModel,
 | 
				
			||||||
    JsonModel,
 | 
					    JsonModel,
 | 
				
			||||||
    Field,
 | 
					    Field,
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
from redis_developer.orm.migrations.migrator import Migrator
 | 
					from redis_developer.model.migrations.migrator import Migrator
 | 
				
			||||||
from redis_developer.orm.model import QueryNotSupportedError, NotFoundError, RedisModelError
 | 
					from redis_developer.model.model import QueryNotSupportedError, NotFoundError, RedisModelError
 | 
				
			||||||
 | 
					
 | 
				
			||||||
r = redis.Redis()
 | 
					r = redis.Redis()
 | 
				
			||||||
today = datetime.date.today()
 | 
					today = datetime.date.today()
 | 
				
			||||||
| 
						 | 
					@ -24,11 +25,6 @@ class BaseJsonModel(JsonModel, abc.ABC):
 | 
				
			||||||
        global_key_prefix = "redis-developer"
 | 
					        global_key_prefix = "redis-developer"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class EmbeddedJsonModel(BaseJsonModel, abc.ABC):
 | 
					 | 
				
			||||||
    class Meta:
 | 
					 | 
				
			||||||
        embedded = True
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
class Note(EmbeddedJsonModel):
 | 
					class Note(EmbeddedJsonModel):
 | 
				
			||||||
    # TODO: This was going to be a full-text search example, but
 | 
					    # TODO: This was going to be a full-text search example, but
 | 
				
			||||||
    #  we can't index embedded documents for full-text search in
 | 
					    #  we can't index embedded documents for full-text search in
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue