Browse Source

Library renamed to tarantool_psql

Removed unused files
master
annelin 1 month ago
parent
commit
c87dbfc5d1

+ 1
- 4
CMakeLists.txt View File

@@ -42,7 +42,4 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
endif()

# Build module
add_subdirectory(pg_tarantool)

add_custom_target(check
COMMAND ${PROJECT_SOURCE_DIR}/test/pg.test.lua)
add_subdirectory(tarantool_psql)

+ 0
- 8
Jenkinsfile View File

@@ -1,8 +0,0 @@
stage('Build'){
packpack = new org.tarantool.packpack()
node {
checkout scm
packpack.prepareSources()
}
packpack.packpackBuildMatrix('result')
}

+ 0
- 5
debian/.gitignore View File

@@ -1,5 +0,0 @@
tarantool-pg/
files
stamp-*
*.substvars
*.log

+ 0
- 5
debian/changelog View File

@@ -1,5 +0,0 @@
tarantool-pg (1.0.2-1) unstable; urgency=medium

* Initial release

-- Roman Tsisyk <roman@tarantool.org> Wed, 16 Sep 2015 17:16:00 +0300

+ 0
- 1
debian/compat View File

@@ -1 +0,0 @@
9

+ 0
- 19
debian/control View File

@@ -1,19 +0,0 @@
Source: tarantool-pg
Priority: optional
Section: database
Maintainer: Roman Tsisyk <roman@tarantool.org>
Build-Depends: debhelper (>= 9), cdbs,
cmake (>= 2.8),
tarantool-dev (>= 1.6.8.0),
libpq-dev (>= 8.1.0)
Standards-Version: 3.9.6
Homepage: https://github.com/tarantool/pg
Vcs-Git: git://github.com/tarantool/pg.git
Vcs-Browser: https://github.com/tarantool/pg

Package: tarantool-pg
Architecture: i386 amd64 armhf arm64
Depends: tarantool (>= 1.6.8.0), ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: PostgreSQL connector for Tarantool
A PostgreSQL connector for Tarantool.

+ 0
- 34
debian/copyright View File

@@ -1,34 +0,0 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: tarantool-pg
Upstream-Contact: roman@tarantool.org
Source: https://github.com/tarantool/pg

Files: *
Copyright: 2010-2013 Tarantool AUTHORS
License: BSD-2-Clause
Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the following
conditions are met:
.
1. Redistributions of source code must retain the above
copyright notice, this list of conditions and the
following disclaimer.
.
2. Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials
provided with the distribution.
.
THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
<COPYRIGHT HOLDER> OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.

+ 0
- 1
debian/docs View File

@@ -1 +0,0 @@
README.md

+ 0
- 8
debian/rules View File

@@ -1,8 +0,0 @@
#!/usr/bin/make -f

DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
-DCMAKE_BUILD_TYPE=RelWithDebInfo
DEB_MAKE_CHECK_TARGET :=

include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk

+ 0
- 1
debian/source/format View File

@@ -1 +0,0 @@
3.0 (quilt)

+ 0
- 41
rpm/tarantool-pg.spec View File

@@ -1,41 +0,0 @@
Name: tarantool-pg
Version: 1.0.2
Release: 1%{?dist}
Summary: PostgreSQL connector for Tarantool
Group: Applications/Databases
License: BSD
URL: https://github.com/tarantool/pg
Source0: https://github.com/tarantool/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: cmake >= 2.8
BuildRequires: gcc >= 4.5
BuildRequires: tarantool-devel >= 1.6.8.0
BuildRequires: postgresql-devel >= 8.1.0
Requires: tarantool >= 1.6.8.0

%description
PostgreSQL connector for Tarantool.

%prep
%setup -q -n %{name}-%{version}

%build
%cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
make %{?_smp_mflags}

## Requires postgresql
#%%check
#make %%{?_smp_mflags} check

%install
%make_install

%files
%{_libdir}/tarantool/*/
%{_datarootdir}/tarantool/*/
%doc README.md
%{!?_licensedir:%global license %doc}
%license LICENSE

%changelog
* Wed Feb 17 2016 Roman Tsisyk <roman@tarantool.org> 1.0.1-1
- Initial version of the RPM spec

pg-tarantool-git-999.rockspec → tarantool-psql.rockspec View File

@@ -1,12 +1,12 @@
package = 'pg-tarantool'
package = 'tarantool-psql'
version = 'git-999'
source = {
url = 'git+https://dev.narayana.im/narayana/pg-tarantool',
url = 'git+https://dev.narayana.im/narayana/tarantool-postgres',

}
description = {
summary = "PostgreSQL driver for Tarantool with SSL support and ehnanced type control features",
homepage = 'https://dev.narayana.im/narayana/pg-tarantool',
homepage = 'https://dev.narayana.im/narayana/tarantool-postgres',
license = 'BSD',
}
dependencies = {

pg_tarantool/CMakeLists.txt → tarantool_psql/CMakeLists.txt View File

@@ -2,8 +2,8 @@ add_library(driver SHARED driver.c)
target_link_libraries(driver ${PostgreSQL_LIBRARIES} -rdynamic)
set_target_properties(driver PROPERTIES PREFIX "" OUTPUT_NAME "driver")

install(TARGETS driver LIBRARY DESTINATION ${TARANTOOL_INSTALL_LIBDIR}/pg_tarantool)
install(DIRECTORY . DESTINATION ${TARANTOOL_INSTALL_LUADIR}/pg_tarantool
install(TARGETS driver LIBRARY DESTINATION ${TARANTOOL_INSTALL_LIBDIR}/tarantool_psql)
install(DIRECTORY . DESTINATION ${TARANTOOL_INSTALL_LUADIR}/tarantool_psql
FILES_MATCHING PATTERN "*.lua")



pg_tarantool/driver.c → tarantool_psql/driver.c View File

@@ -310,7 +310,7 @@ static int lua_pg_connect(struct lua_State *L) {
return 2;
}

LUA_API int luaopen_pg_tarantool_driver(lua_State *L) {
LUA_API int luaopen_tarantool_pgsql_driver(lua_State *L) {
static const struct luaL_Reg methods [] = {
#if PG_VERSION_NUM >= 90000
{"quote", lua_pg_quote},

pg_tarantool/fallback/json.lua → tarantool_psql/fallback/json.lua View File


pg_tarantool/fallback/lpeg.lua → tarantool_psql/fallback/lpeg.lua View File


pg_tarantool/init.lua → tarantool_psql/init.lua View File

@@ -1,6 +1,6 @@
local fiber = require 'fiber'
local types = require 'pg_tarantool.types'
local driver = require 'pg_tarantool.driver'
local types = require 'tarantool_psql.types'
local driver = require 'tarantool_psql.driver'
driver.decode = types.decode

local SQL_RESET = "begin; reset all; commit;"

pg_tarantool/types/array.lua → tarantool_psql/types/array.lua View File

@@ -1,8 +1,8 @@
-------------------------------
-- tarantool_psql array type ----
-------------------------------
local __pcall__, lpeg_lib = pcall(require, 'lpeg')
lpeg_lib = (__pcall__) and lpeg_lib or require 'pg_tarantool.fallback.lpeg'
lpeg_lib = (__pcall__) and lpeg_lib or require 'tarantool_psql.fallback.lpeg'

------------------------------
-- functions -----------------

pg_tarantool/types/hstore.lua → tarantool_psql/types/hstore.lua View File

@@ -1,8 +1,8 @@
------------------------------
-- tarantool_psql hstore handler-
------------------------------
local __pcall__, lpeg_lib = pcall(require, 'lpeg')
lpeg_lib = (__pcall__) and lpeg_lib or require 'pg_tarantool.fallback.lpeg'
lpeg_lib = (__pcall__) and lpeg_lib or require 'tarantool_psql.fallback.lpeg'

------------------------------
-- functions -----------------

pg_tarantool/types/init.lua → tarantool_psql/types/init.lua View File

@@ -4,9 +4,9 @@ _M.null = nil

-- type classes --
local _types = {
array = require 'pg_tarantool.types.array',
json = require 'pg_tarantool.types.json',
hstore = require 'pg_tarantool.types.hstore',
array = require 'tarantool_psql.types.array',
json = require 'tarantool_psql.types.json',
hstore = require 'tarantool_psql.types.hstore',
varchar = { encode = function(str, escape) return escape(str) end },
integer = { decode = tonumber },
boolean = { decode = function(str) return (str == 't') end },

pg_tarantool/types/json.lua → tarantool_psql/types/json.lua View File

@@ -1,8 +1,8 @@
------------------------------
-- tarantool_psql json handler -
------------------------------
local __pcall__,json = pcall(require, 'cjson')
json = (__pcall__) and json or require 'pg_tarantool.fallback.json'
json = (__pcall__) and json or require 'tarantool_psql.fallback.json'

------------------------------
-- functions -----------------

Loading…
Cancel
Save