feat(db) move Consumers from kong.dao to kong.db using DAO wrapper #3437
Conversation
| @@ -740,6 +741,33 @@ return { | |||
| DROP TABLE ssl_certificates; | |||
| DROP TABLE ssl_servers_names; | |||
| ]], | |||
| down = nil | |||
| down = nil, | |||
There was a problem hiding this comment.
In order to remove this migration we need to have #3328 merged first.
| @@ -251,7 +251,7 @@ for _, strategy in helpers.each_strategy() do | |||
| local credential | |||
| before_each(function() | |||
| dao:truncate_table("oauth2_credentials") | |||
| dao:truncate_table("consumers") | |||
| db:truncate("consumers") | |||
| db:truncate("services") | |||
There was a problem hiding this comment.
Just call db:truncate() here (it does not accept params, it removes everthing)
kong/db/dao/consumers.lua
Outdated
| local old_dao = self.db.old_dao | ||
| local rows, err = old_dao[table_name]:find_all(fk) | ||
| if err then | ||
| ngx.log(ngx.ERR, "could not gather associated entities for delete cascade: ", err) |
There was a problem hiding this comment.
check that err can be used like this (it is not a table without __tostring for example)
Namespace the error messages with consumers.delete_cascade
There was a problem hiding this comment.
Checked: find_all either hard-stops with error("foo") (when not given a table as parameter, for example) or executes ret_error, which makes sure that the second returned value (an old-dao-style error table) is always tostring-ed.
kong/dao/db/cassandra.lua
Outdated
|
|
||
| if self.new_db[constraint.table] then | ||
| -- new DAO | ||
| local res, err = self.new_db[constraint.table]:check_foreign_key({ |
There was a problem hiding this comment.
Move the check_foreign_key function outside of the new DAO to the old DAO/strategy.
kong/dao/db/postgres.lua
Outdated
| local function check_foreign_constraints(self, values, constraints) | ||
| local errors | ||
|
|
||
| for col, constraint in pairs(constraints.foreign) do |
There was a problem hiding this comment.
Remove this and see if the invalidation tests still run for postgres (maybe postgres migrations do this already)
kong/db/dao/init.lua
Outdated
| @@ -527,7 +527,7 @@ function DAO:check_foreign_key(primary_key, human_name) | |||
| return entity | |||
| end | |||
|
|
|||
| local msg = string.format("No such %s (%s)" , | |||
| local msg = string.format("No such entry in %s (%s)" , | |||
|
|
||
| constraints = constraints[name], | ||
|
|
||
| cache_key = function(_, a1, a2, a3, a4, a5) |
There was a problem hiding this comment.
Set to DEBUG level with a debug traceback.
|
Pending: |
|
Filtering via custom_id also done |
* On the old DAO side (`kong.dao`), this adds some utilities that are needed later for relationships between old-DAO and new-DAO entities, once Consumers are moved into the new DAO. * On the new DAO side (`kong.db`), this adds old DAO access in new DAO. This is needed in order to perform cascade-deletes of old-DAO entities when a new-DAO entity is deleted.
Changes in other modules are to ensure that a DAOFactory instance always gets a DB instance.
hishamhm
force-pushed
the
feat/consumers-dao-wrapper
branch
from
a7907aa
to
82a4e43
Compare
kikito
force-pushed
the
feat/consumers-dao-wrapper
branch
from
82a4e43
to
1c354ce
Compare
hishamhm
force-pushed
the
feat/consumers-dao-wrapper
branch
from
1c354ce
to
82a4e43
Compare
No description provided.