Merge pull request #4 from weynelucas/chore/namespaced_tables

chore(builders): apply strategy for include namespace

Author: weynelucas

.github/workflows/python-package.yml .github/workflows/main.yml.github/workflows/python-package.yml renamed to .github/workflows/main.yml

@@ -16,12 +16,7 @@ def __init__(self, settings=None):
  self.settings = settings or self.default_db_settings
 
  def process_name(
- self,
- model: Model,
- fields: Fields,
- type: str,
- qualifier='',
- include_namespace=True,
+ self, model: Model, fields: Fields, type: str, qualifier=''
  ):
  parts = split_table_identifiers(
  model._meta.db_table,
@@ -44,11 +39,17 @@ def process_name(
  name=name,
  )
 
- if namespace and include_namespace:
+ include_namespace = namespace and self.should_include_namespace(
+ model, fields, type, qualifier
+ )
+ if include_namespace:
  return '"{}"."{}"'.format(namespace, obj_name)
 
  return obj_name
 
+ def should_include_namespace(self, model, field, type, qualifier=''):
+ return type in ['sequence', 'trigger', 'index']
+
  @cached_property
  def object_type_name_formats(self):
  return {

db_adapter/name_builders.py

@@ -62,6 +62,19 @@ class Meta:
  db_table = 'tbl_post'
 
 
+class TwitterPost(DBAdapterModel):
+ id = models.AutoField(primary_key=True, db_column='twitter_id')
+ name = models.CharField(max_length=100, primary_key=True)
+ flag = models.CharField(max_length=30, null=True, unique=True)
+ description = models.TextField(
+ null=True, help_text='Optional description for tag'
+ )
+
+ class Meta:
+ abstract = True
+ db_table = '"twitter"."tbl_post"'
+
+
 class Article(DBAdapterModel):
  article_id = models.BigAutoField(primary_key=True)
  name = models.CharField(max_length=30)

tests/models.py

@@ -3,7 +3,7 @@
 from db_adapter.name_builders import ObjectNameBuilder
 from db_adapter.settings import DatabaseAdapterSettings
 
-from .models import Post, Reporter
+from .models import Post, TwitterPost
 
 
 class ObjectNameBuilderTests(TestCase):
@@ -15,8 +15,9 @@ def setUp(self):
  'DEFAULT_TRIGGER_NAME': 'tg_{table_name}_b',
  'DEFAULT_INDEX_NAME': '{columns}_idx',
  'DEFAULT_PRIMARY_KEY_NAME': 'pk_{name}',
- 'DEFAULT_CHECK_NAME': 'check{qualifier}',
+ 'DEFAULT_FOREIGN_KEY_NAME': 'fk_{name}',
  'DEFAULT_UNIQUE_NAME': 'ct_{table_name}_{columns}_uniq',
+ 'DEFAULT_CHECK_NAME': 'check{qualifier}',
  }
  )
 
@@ -82,14 +83,26 @@ def test_process_namespaced_table(self):
  """
  When a model include namespace inside `Meta.db_table`, all object names
  builded from that model should include the namespace too, excluding
- calls with `include_namespace=False`
+ primary/unique/foreign keys and check constraints
  """
- kwargs = dict(model=Reporter, fields=[], type='trigger')
 
- with_namespace = self.builder.process_name(**kwargs)
- without_namespace = self.builder.process_name(
- **kwargs, include_namespace=False
+ model = TwitterPost
+ field = TwitterPost._meta.get_field('id')
+
+ sequence = self.builder.process_name(model, [field], 'sequence')
+ trigger = self.builder.process_name(model, [field], 'trigger')
+ index = self.builder.process_name(model, [field], 'index')
+ primary_key = self.builder.process_name(model, [field], 'primary_key')
+ foreign_key = self.builder.process_name(model, [field], 'foreign_key')
+ unique = self.builder.process_name(model, [field], 'unique')
+ check = self.builder.process_name(
+ model, [field], 'check', qualifier='_nn'
  )
 
- self.assertEqual(with_namespace, '"tests"."tg_reporter_b"')
- self.assertEqual(without_namespace, 'tg_reporter_b')
+ self.assertEqual(sequence, '"twitter"."tbl_post_seq"')
+ self.assertEqual(trigger, '"twitter"."tg_post_b"')
+ self.assertEqual(index, '"twitter"."twitter_id_idx"')
+ self.assertEqual(primary_key, 'pk_post_twitter_id')
+ self.assertEqual(foreign_key, 'fk_post_twitter_id')
+ self.assertEqual(unique, 'ct_post_twitter_id_uniq')
+ self.assertEqual(check, 'check_nn')