Skip to content

Commit

Permalink
old project name orafunc was replaced by current orafce on all places
Browse files Browse the repository at this point in the history
  • Loading branch information
okbob committed Dec 25, 2014
1 parent 180dccd commit 3d60f7b
Show file tree
Hide file tree
Showing 41 changed files with 61 additions and 61 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
*.so
*.so.*
/.deps/
/orafunc.sql
/orafunc.sql.in
/orafce.sql
/orafce.sql.in
/sqlparse.c
/sqlparse.h
/sqlscan.c
Expand Down
File renamed without changes.
File renamed without changes.
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
MODULE_big = orafunc
MODULE_big = orafce
OBJS= convert.o file.o datefce.o magic.o others.o plvstr.o plvdate.o shmmc.o plvsubst.o utility.o plvlex.o alert.o pipe.o sqlparse.o putline.o assert.o plunit.o random.o aggregate.o oraguc.o varchar2.o nvarchar2.o

EXTENSION = orafce

DATA_built = orafunc.sql
DATA = uninstall_orafunc.sql orafce--3.0.7.sql orafce--unpackaged--3.0.7.sql
DOCS = README.asciidoc COPYRIGHT.orafunc INSTALL.orafunc
DATA_built = orafce.sql
DATA = uninstall_orafce.sql orafce--3.0.7.sql orafce--unpackaged--3.0.7.sql
DOCS = README.asciidoc COPYRIGHT.orafce INSTALL.orafce

PG_CONFIG ?= pg_config

Expand All @@ -16,14 +16,14 @@ INTVERSION := $(shell echo $$(($$(echo $(VERSION) | sed 's/\([[:digit:]]\{1,\}\)
# make "all" the default target
all:

REGRESS = orafunc dbms_output dbms_utility files varchar2 nvarchar2
REGRESS = orafce dbms_output dbms_utility files varchar2 nvarchar2

ifeq ($(shell echo $$(($(INTVERSION) >= 804))),1)
REGRESS += aggregates nlssort dbms_random
endif

REGRESS_OPTS = --load-language=plpgsql --schedule=parallel_schedule
REGRESSION_EXPECTED = expected/orafunc.out expected/dbms_pipe_session_B.out
REGRESSION_EXPECTED = expected/orafce.out expected/dbms_pipe_session_B.out

ifeq ($(shell echo $$(($(INTVERSION) <= 802))),1)
$(REGRESSION_EXPECTED): %.out: %1.out
Expand All @@ -35,7 +35,7 @@ endif

installcheck: $(REGRESSION_EXPECTED)

EXTRA_CLEAN = sqlparse.c sqlparse.h sqlscan.c y.tab.c y.tab.h orafunc.sql.in expected/orafunc.out expected/dbms_pipe_session_B.out
EXTRA_CLEAN = sqlparse.c sqlparse.h sqlscan.c y.tab.c y.tab.h orafce.sql.in expected/orafce.out expected/dbms_pipe_session_B.out

ifndef USE_PGXS
top_builddir = ../..
Expand Down Expand Up @@ -102,10 +102,10 @@ ifndef MAJORVERSION
MAJORVERSION := $(basename $(VERSION))
endif

orafunc.sql.in:
if [ -f orafunc-$(MAJORVERSION).sql ] ; \
orafce.sql.in:
if [ -f orafce-$(MAJORVERSION).sql ] ; \
then \
cat orafunc-common.sql orafunc-$(MAJORVERSION).sql > orafunc.sql.in; \
cat orafce-common.sql orafce-$(MAJORVERSION).sql > orafce.sql.in; \
else \
cat orafunc-common.sql orafunc-common-2.sql > orafunc.sql.in; \
cat orafce-common.sql orafce-common-2.sql > orafce.sql.in; \
fi
2 changes: 1 addition & 1 deletion aggregate.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "postgres.h"
#include "funcapi.h"
#include "orafunc.h"
#include "orafce.h"

#if PG_VERSION_NUM >= 80400

Expand Down
2 changes: 1 addition & 1 deletion alert.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "storage/lwlock.h"
#include "utils/timestamp.h"

#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"
#include "pipe.h"
#include "shmmc.h"
Expand Down
2 changes: 1 addition & 1 deletion assert.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "catalog/namespace.h"
#include "ctype.h"
#include "string.h"
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

PG_FUNCTION_INFO_V1(dbms_assert_enquote_literal);
Expand Down
2 changes: 1 addition & 1 deletion convert.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "utils/pg_locale.h"
#include "utils/formatting.h"

#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

PG_FUNCTION_INFO_V1(orafce_to_char_int4);
Expand Down
2 changes: 1 addition & 1 deletion datefce.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "utils/numeric.h"
#include "utils/formatting.h"
#include <sys/time.h>
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

#define ENABLE_INTERNATIONALIZED_WEEKDAY
Expand Down
24 changes: 12 additions & 12 deletions expected/init.out
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
\set ECHO none
psql:orafunc.sql:1946: NOTICE: type "varchar2" is not yet defined
psql:orafce.sql:1956: NOTICE: type "varchar2" is not yet defined
DETAIL: Creating a shell type definition.
psql:orafunc.sql:1953: NOTICE: argument type varchar2 is only a shell
psql:orafunc.sql:1967: NOTICE: return type varchar2 is only a shell
psql:orafunc.sql:1974: NOTICE: argument type varchar2 is only a shell
psql:orafunc.sql:1995: NOTICE: argument type varchar2 is only a shell
psql:orafunc.sql:1995: NOTICE: return type varchar2 is only a shell
psql:orafunc.sql:2148: NOTICE: type "nvarchar2" is not yet defined
psql:orafce.sql:1963: NOTICE: argument type varchar2 is only a shell
psql:orafce.sql:1977: NOTICE: return type varchar2 is only a shell
psql:orafce.sql:1984: NOTICE: argument type varchar2 is only a shell
psql:orafce.sql:2005: NOTICE: argument type varchar2 is only a shell
psql:orafce.sql:2005: NOTICE: return type varchar2 is only a shell
psql:orafce.sql:2158: NOTICE: type "nvarchar2" is not yet defined
DETAIL: Creating a shell type definition.
psql:orafunc.sql:2155: NOTICE: argument type nvarchar2 is only a shell
psql:orafunc.sql:2169: NOTICE: return type nvarchar2 is only a shell
psql:orafunc.sql:2176: NOTICE: argument type nvarchar2 is only a shell
psql:orafunc.sql:2197: NOTICE: argument type nvarchar2 is only a shell
psql:orafunc.sql:2197: NOTICE: return type nvarchar2 is only a shell
psql:orafce.sql:2165: NOTICE: argument type nvarchar2 is only a shell
psql:orafce.sql:2179: NOTICE: return type nvarchar2 is only a shell
psql:orafce.sql:2186: NOTICE: argument type nvarchar2 is only a shell
psql:orafce.sql:2207: NOTICE: argument type nvarchar2 is only a shell
psql:orafce.sql:2207: NOTICE: return type nvarchar2 is only a shell
24 changes: 12 additions & 12 deletions expected/nlssort.out
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
-- Tests for nlssort
\set ECHO none
psql:orafunc.sql:1946: NOTICE: type "varchar2" is not yet defined
psql:orafce.sql:1956: NOTICE: type "varchar2" is not yet defined
DETAIL: Creating a shell type definition.
psql:orafunc.sql:1953: NOTICE: argument type varchar2 is only a shell
psql:orafunc.sql:1967: NOTICE: return type varchar2 is only a shell
psql:orafunc.sql:1974: NOTICE: argument type varchar2 is only a shell
psql:orafunc.sql:1995: NOTICE: argument type varchar2 is only a shell
psql:orafunc.sql:1995: NOTICE: return type varchar2 is only a shell
psql:orafunc.sql:2148: NOTICE: type "nvarchar2" is not yet defined
psql:orafce.sql:1963: NOTICE: argument type varchar2 is only a shell
psql:orafce.sql:1977: NOTICE: return type varchar2 is only a shell
psql:orafce.sql:1984: NOTICE: argument type varchar2 is only a shell
psql:orafce.sql:2005: NOTICE: argument type varchar2 is only a shell
psql:orafce.sql:2005: NOTICE: return type varchar2 is only a shell
psql:orafce.sql:2158: NOTICE: type "nvarchar2" is not yet defined
DETAIL: Creating a shell type definition.
psql:orafunc.sql:2155: NOTICE: argument type nvarchar2 is only a shell
psql:orafunc.sql:2169: NOTICE: return type nvarchar2 is only a shell
psql:orafunc.sql:2176: NOTICE: argument type nvarchar2 is only a shell
psql:orafunc.sql:2197: NOTICE: argument type nvarchar2 is only a shell
psql:orafunc.sql:2197: NOTICE: return type nvarchar2 is only a shell
psql:orafce.sql:2165: NOTICE: argument type nvarchar2 is only a shell
psql:orafce.sql:2179: NOTICE: return type nvarchar2 is only a shell
psql:orafce.sql:2186: NOTICE: argument type nvarchar2 is only a shell
psql:orafce.sql:2207: NOTICE: argument type nvarchar2 is only a shell
psql:orafce.sql:2207: NOTICE: return type nvarchar2 is only a shell
name
--------
brown
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion file.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "storage/fd.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

#ifndef ERRCODE_NO_DATA_FOUND
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion orafce.control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# intarray extension
comment = 'Functions and operators that emulate a subset of functions and packages from the Oracle RDBMS'
default_version = '3.0.7'
module_pathname = '$libdir/orafunc'
module_pathname = '$libdir/orafce'
relocatable = false
4 changes: 2 additions & 2 deletions orafunc.h → orafce.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __ORAFUNC__
#define __ORAFUNC__
#ifndef __ORAFCE__
#define __ORAFCE__

#include "postgres.h"
#include "catalog/catversion.h"
Expand Down
2 changes: 1 addition & 1 deletion oraguc.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "postgres.h"
#include "utils/guc.h"
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

/* default value */
Expand Down
2 changes: 1 addition & 1 deletion others.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion pipe.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "shmmc.h"
#include "pipe.h"
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion plunit.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "funcapi.h"
#include "parser/parse_oper.h"
#include "utils/builtins.h"
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

PG_FUNCTION_INFO_V1(plunit_assert_true);
Expand Down
2 changes: 1 addition & 1 deletion plvdate.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "utils/nabstime.h"
#include <sys/time.h>
#include <stdlib.h>
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"


Expand Down
2 changes: 1 addition & 1 deletion plvlex.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "nodes/pg_list.h"
#include "funcapi.h"
#include "catalog/pg_type.h"
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

typedef struct {
Expand Down
2 changes: 1 addition & 1 deletion plvstr.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "catalog/pg_type.h"
#include "libpq/pqformat.h"
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

PG_FUNCTION_INFO_V1(plvstr_rvrs);
Expand Down
2 changes: 1 addition & 1 deletion plvsubst.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "utils/memutils.h"
#include "utils/lsyscache.h"
#include "access/tupmacs.h"
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

PG_FUNCTION_INFO_V1(plvsubst_string_array);
Expand Down
2 changes: 1 addition & 1 deletion putline.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "utils/builtins.h"
#include "utils/lsyscache.h"

#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

#if defined(WIN32) && !defined(_MSC_VER)
Expand Down
2 changes: 1 addition & 1 deletion random.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <math.h>
#include <errno.h>

#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

PG_FUNCTION_INFO_V1(dbms_random_initialize);
Expand Down
2 changes: 1 addition & 1 deletion shmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "shmmc.h"
#include "stdlib.h"
#include "string.h"
#include "orafunc.h"
#include "orafce.h"


#define LIST_ITEMS 512
Expand Down
2 changes: 1 addition & 1 deletion sql/init.sql
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
\set ECHO none
\i orafunc.sql
\i orafce.sql
2 changes: 1 addition & 1 deletion sql/nlssort.sql
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DROP DATABASE IF EXISTS regression_sort;
CREATE DATABASE regression_sort WITH TEMPLATE = template0 ENCODING='SQL_ASCII' LC_COLLATE='C' LC_CTYPE='C';
\c regression_sort
\set ECHO none
\i orafunc.sql
\i orafce.sql
CREATE TABLE test_sort (name TEXT);
INSERT INTO test_sort VALUES ('red'), ('brown'), ('yellow'), ('Purple');
SELECT * FROM test_sort ORDER BY NLSSORT(name, 'en_US.utf8');
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion sqlparse.y
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ else \
} while (0)

#include "postgres.h"
#include "orafunc.h"
#include "orafce.h"
#include "plvlex.h"
#include "nodes/pg_list.h"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion utility.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "utils/memutils.h"
#include "utils/lsyscache.h"
#include "access/tupmacs.h"
#include "orafunc.h"
#include "orafce.h"
#include "builtins.h"

#include "utils/elog.h"
Expand Down

0 comments on commit 3d60f7b

Please sign in to comment.