Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(postgres) use pgmoon-mashape 2.0.0 #1582

Merged
merged 1 commit into from
Sep 2, 2016
Merged

fix(postgres) use pgmoon-mashape 2.0.0 #1582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/busted
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- force LuaSocket usage to resolve `/etc/hosts` until
-- supported by resty-cli.
-- See https://github.com/Mashape/kong/issues/1523
for _, namespace in ipairs({"cassandra", "pgmoon"}) do
for _, namespace in ipairs({"cassandra", "pgmoon-mashape"}) do
local socket = require(namespace .. ".socket")
socket.force_luasocket(ngx.get_phase(), true)
end
Expand Down
2 changes: 1 addition & 1 deletion bin/kong
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- force LuaSocket usage to resolve `/etc/hosts` until
-- supported by resty-cli.
-- See https://github.com/Mashape/kong/issues/1523
for _, namespace in ipairs({"cassandra", "pgmoon"}) do
for _, namespace in ipairs({"cassandra", "pgmoon-mashape"}) do
local socket = require(namespace .. ".socket")
socket.force_luasocket(ngx.get_phase(), true)
end
Expand Down
2 changes: 1 addition & 1 deletion kong-0.9.0-0.rockspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies = {
"version == 0.2",
"lapis == 1.5.1",
"lua-cassandra == 0.5.3",
"pgmoon-mashape == 1.7.0",
"pgmoon-mashape == 2.0.0",
"luatz == 0.3",
"lua_system_constants == 0.1.1",
"lua-resty-iputils == 0.2.1",
Expand Down
6 changes: 1 addition & 5 deletions kong/dao/postgres_db.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
local pgmoon = require "pgmoon-mashape"
local BaseDB = require "kong.dao.base_db"
local Errors = require "kong.dao.errors"
local utils = require "kong.tools.utils"
local uuid = utils.uuid

local TTL_CLEANUP_INTERVAL = 60 -- 1 minute

local ngx_stub = _G.ngx
_G.ngx = nil
local pgmoon = require "pgmoon"
_G.ngx = ngx_stub

local PostgresDB = BaseDB:extend()

PostgresDB.dao_insert_values = {
Expand Down