oracledb 3.0.0 → 3.1.2

package/package/MAKEPKG.BAT

@@ -1,156 +0,0 @@
-@echo off
-REM Copyright (c) 2017, Oracle and/or its affiliates.  All Rights reserved
-REM
-REM ******************************************************************************
-REM *
-REM * You may not use the identified files except in compliance with the Apache
-REM * License, Version 2.0 (the "License.")
-REM *
-REM * You may obtain a copy of the License at
-REM * http://www.apache.org/licenses/LICENSE-2.0.
-REM *
-REM * Unless required by applicable law or agreed to in writing, software
-REM * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-REM * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM *
-REM * See the License for the specific language governing permissions and
-REM * limitations under the License.
-REM *
-REM * NAME
-REM *   MAKEPKG.BAT
-REM *
-REM * DESCRIPTION
-REM *   Create/cleanup of binary package for the current node-oracledb binary.
-REM *
-REM *****************************************************************************
-
-REM
-REM usage: MAKEPKG.BAT [<cmd>]
-REM      : Possible values for <cmd> are: CLEANUP, CREATEBINARY
-REM        and CREATESTAGEBINARY
-REM
-REM expected to run this batch file from package sub-directory,
-REM where a fresh clone is created.
-REM
-
-REM expecting 1 parameter, make sure we have some arguments
-if "%1" == "" GOTO usage
-
-REM jump to appropriate sections based on <cmd>
-if "%1" == "CLEANUP"  GOTO cleanup
-if "%1" == "CREATEBINARY"  GOTO createbinary
-if "%1" == "CREATESTAGEBINARY"  GOTO createstagebinary
-goto usage
-
-REM cleanup section, remove file(s) created by this batch file
-:cleanup
-echo "cleanup section"
-del ..\package-lock.json
-del SHASUMS256.txt oracledb-v*-node-*.gz
-goto exit
-
-
-REM compile, package to gz file
-:createstagebinary
-echo "createstagebinary section"
-
-REM Append SHA to LICENSE.MD
-git checkout ..\LICENSE.md
-setlocal enabledelayedexpansion
-REM compose a string with commands to execute one by one
-
-REM start with empty string
-set CONCAT_STR=
-REM capture SHA
-FOR /F "tokens=* USEBACKQ" %%F IN (`git --git-dir=..\.git rev-parse HEAD`) DO (
-SET CONCAT_STR=%%F
-)
-
-set DATE_STR=
-FOR /F "tokens=* USEBACKQ" %%F IN (`DATE /T`) DO ( SET DATE_STR=%%F )
-
-REM append output of other commands
-set CMD_STR="git --git-dir=..\odpi\.git rev-parse HEAD && node --version"
-for /f %%i in ('%CMD_STR%') do set "CONCAT_STR=!CONCAT_STR! %%i"
-set CONCAT_STR=!CONCAT_STR! !DATE_STR!
-echo !CONCAT_STR! >> ..\LICENSE.MD
-
-REM Compile node-oracledb
-cd ..
-CALL npm install
-echo "NODE oracledb compiled"
-cd package
-echo "==> Staging Binary package created for Node.js "
-
-Set "hostname=%NODE_ORACLEDB_PACKAGE_HOSTNAME%"
-Set "pathname=%NODE_ORACLEDB_PACKAGE_URL_PATH%"
-Set "newname=%NODE_PKG_HOSTNAME%"
-echo ON
-echo %hostname%
-echo %pathname%
-echo %newname%
-
-sed  "s/github.com/%hostname%/g" oracledbinstall.js
-sed  "s/oracle\/node-oracledb\/releases\/download\//%pathname%/g" oracledbinstall.js
-
-del /S *.gz
-
-node createpackage.js
-xcopy /Y "package.json" "../package.json"
-npm pack
-Setlocal enabledelayedexpansion
-
-Set "Pattern=oracledb"
-Set "Replace=oracledb-staging"
-
-For %%a in (*.gz) Do (
-    Set "File=%%~a"
-    Ren "%%a" "!File:%Pattern%=%Replace%!"
-)
-
-goto exit
-
-REM compile, package to gz file
-:createbinary
-echo "createbinary section"
-
-REM Append SHA to LICENSE.MD
-git checkout ..\LICENSE.md
-setlocal enabledelayedexpansion
-REM compose a string with commands to execute one by one
-
-REM start with empty string
-set CONCAT_STR=
-REM capture SHA
-FOR /F "tokens=* USEBACKQ" %%F IN (`git --git-dir=..\.git rev-parse HEAD`) DO (
-SET CONCAT_STR=%%F
-)
-
-set DATE_STR=
-FOR /F "tokens=* USEBACKQ" %%F IN (`DATE /T`) DO ( SET DATE_STR=%%F )
-
-REM append output of other commands
-set CMD_STR="git --git-dir=..\odpi\.git rev-parse HEAD && node --version"
-for /f %%i in ('%CMD_STR%') do set "CONCAT_STR=!CONCAT_STR! %%i"
-set CONCAT_STR=!CONCAT_STR! !DATE_STR!
-echo !CONCAT_STR! >> ..\LICENSE.MD
-
-REM Compile node-oracledb
-cd ..
-CALL npm install
-echo "NODE oracledb compiled"
-cd package
-echo "==> Binary package created for Node.js "
-
-REM create compressed file
-node createpackage.js
-goto exit
-
-REM display usage string
-:usage
-echo "usage: MAKEPKG.BAT [<cmd>]
-goto exit
-
-
-REM Exit point
-:exit

package/package/Makefile

@@ -1,85 +0,0 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
-#
-# You may not use the identified files except in compliance with the Apache
-# License, Version 2.0 (the "License.")
-#
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0.
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-CP=cp
-MV=mv
-CD=cd
-ECHO=echo
-DATE=date -u
-SED=sed
-RMDIR=rm -rf
-RMALL=rm -f
-GIT=git
-NODE=node
-NPM=npm
-
-GITSHA=$(shell $(GIT) --git-dir=../.git rev-parse --verify HEAD)
-SUBMOD=$(shell $(GIT) --git-dir=../odpi/.git rev-parse --verify HEAD)
-NODEVER=$(shell $(NODE) --version)
-BUILDDATE=$(shell $(DATE))
-
-# createpackage.js assumes these paths
-BINARY_PATH_LOCAL=../build/Release/oracledb.node
-LICENSE_PATH_LOCAL=../LICENSE.md
-
-# Find the node-oracledb version number
-VER=$(shell $(NODE) getversion.js)
-
-# The staging-oracledb-X.Y.Z.tgz package will try to download binaries from
-# https://$NODE_ORACLEDB_PACKAGE_HOSTNAME/$NODE_ORACLEDB_PACKAGE_URL_PATH/vX.Y.Z/
-ifndef NODE_ORACLEDB_PACKAGE_HOSTNAME
-	NODE_ORACLEDB_PACKAGE_HOSTNAME=your-staging-server.example.com
-endif
-ifndef NODE_ORACLEDB_PACKAGE_URL_PATH
-	NODE_ORACLEDB_PACKAGE_URL_PATH=/your-url-path-to-directory/
-endif
-
-# Create the generic 'npm install' package with a package.json that
-# invokes oracledbinstall.js at install time
-npmpackage:
-	$(ECHO) "$(GITSHA) $(BUILDDATE)" > ../lib/rel.txt
-	$(NPM) pack .. && $(MV) oracledb-$(VER).tgz oracledb-src-$(VER).tgz
-	@$(ECHO) "==> Created generic GitHub source package for node-oracledb $(VER)"
-
-	$(SED) -e "s#'github.com'#'$(NODE_ORACLEDB_PACKAGE_HOSTNAME)'#" oracledbinstall.js > oracledbinstall.js.tmp && $(MV) oracledbinstall.js.tmp oracledbinstall.js
-	$(SED) -e "s#'/oracle/node-oracledb/releases/download/'#'$(NODE_ORACLEDB_PACKAGE_URL_PATH)'#" oracledbinstall.js > oracledbinstall.js.tmp && $(MV) oracledbinstall.js.tmp oracledbinstall.js
-	$(CP) package.json ../package.json
-	$(NPM) pack .. && $(MV) oracledb-$(VER).tgz staging-oracledb-$(VER).tgz
-	@$(ECHO) "==> Created generic npm staging package for node-oracledb $(VER)"
-
-	$(GIT) checkout oracledbinstall.js && $(NPM) pack ..
-	$(GIT) checkout ../package.json
-	@$(RMALL) ../lib/rel.txt
-	@$(ECHO) "==> Created generic npm production package for node-oracledb $(VER)"
-
-# Create a package containing (i) the license file and (ii) the
-# node-oracledb binary for the current environment
-binarypackage: $(BINARY_PATH_LOCAL) $(LICENSE_PATH_LOCAL)
-	$(GIT) checkout $(LICENSE_PATH_LOCAL)
-	$(CP) $(LICENSE_PATH_LOCAL) $(LICENSE_PATH_LOCAL).bk && $(ECHO) "$(GITSHA) $(SUBMOD) $(NODEVER) $(BUILDDATE)" >> $(LICENSE_PATH_LOCAL)
-	$(NODE) createpackage.js
-	$(MV) $(LICENSE_PATH_LOCAL).bk $(LICENSE_PATH_LOCAL)
-	@$(ECHO) "==> Created binary package for Node.js `$(NODE) --version`"
-
-# Build the node-oracledb binary
-$(BINARY_PATH_LOCAL): cleanbinary
-	($(CD) .. && $(NPM) install)
-
-clean: cleanbinary
-	$(RMALL) ../package-lock.json
-	$(RMALL) oracledb-$(VER).tgz staging-oracledb-$(VER).tgz SHASUMS256.txt oracledb-v*-node-*.gz
-
-cleanbinary:
-	$(RMALL) $(BINARY_PATH_LOCAL)

package/package/createpackage.js

@@ -1,186 +0,0 @@
-/* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. */
-
-/******************************************************************************
- *
- * You may not use the identified files except in compliance with the Apache
- * License, Version 2.0 (the "License.")
- *
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * NAME
- *   createpackage.js
- *
- * DESCRIPTION
- *   Creates a binary package for the current node-oracledb binary.  A
- *   custom package format is used.  The package uses a custom format
- *   with three components: length bytes (giving the length of the
- *   license file), the license file, and then the node-oracledb
- *   binary.  The package is gzipped.
- *
- *****************************************************************************/
-
-'use strict';
-
-const fs = require('fs');
-const Readable = require('stream').Readable;
-const zlib = require('zlib');
-const path = require('path');
-const util = require('util');
-const packageUtil = require('./util.js');
-
-packageUtil.initDynamicProps();
-
-// writeFileToReadable is used to buffer the contents of files to a readable
-// stream that can be written out later.
-function writeFileToReadable(path, readable) {
-  return new Promise((resolve, reject) => {
-    packageUtil.trace('In writeFileToReadable', path, util.inspect(readable, {depth: 0}));
-
-    const rs = fs.createReadStream(path);
-
-    rs.on('data', chunk => {
-      readable.push(chunk);
-    });
-
-    rs.on('error', err => {
-      reject(err);
-    });
-
-    rs.on('close', () => {
-      resolve();
-    });
-  });
-}
-
-// createPackage is used to create a custom file that combines the node-oracledb
-// binary with the license. This function is meant to be used at the command line.
-function createPackage() {
-  packageUtil.trace('In createPackage');
-
-  let binaryPath = packageUtil.BINARY_PATH_LOCAL;
-
-  for (let x = 2; x < process.argv.length; x += 1) {
-    let argParts = process.argv[x].split('=');
-    let argName = argParts[0];
-    let argVal = argParts[1];
-
-    if (argName === 'path') {
-      binaryPath = argVal;
-    }
-  }
-
-  if (!binaryPath.endsWith(packageUtil.BINARY_FILE_NAME)) {
-    throw new Error('path should resolve to a file named ' + packageUtil.BINARY_FILE_NAME);
-  }
-
-  let binaryStats = fs.statSync(binaryPath);
-
-  if (!binaryStats.isFile()) {
-    throw new Error('path did not resolve to a file');
-  }
-
-  // Requiring in the binary ensures that it matches the version of Node.js currently
-  // running. This is important as the process variable is used to file naming.
-  require(path.normalize(binaryPath + '/../../../'));
-
-  let licensePath;
-
-  if (binaryPath != packageUtil.BINARY_PATH_LOCAL) {
-    licensePath = path.normalize(binaryPath + '/../../../' + packageUtil.LICENSE_FILE_NAME);
-  } else {
-    licensePath = packageUtil.LICENSE_PATH_LOCAL;
-  }
-
-  class TempReadable extends Readable {
-    constructor(options) {
-      super(options);
-    }
-
-    _read(size) {} // Must be implemented but not used
-  }
-
-  const tempReadable = new TempReadable({
-    highWaterMark: 1048576 // 1 MB
-  });
-
-  packageUtil.getSha(binaryPath)
-    .then(binarySha => {
-      const newShaLine = binarySha + '  ' + packageUtil.dynamicProps.BINARY_BUILD_NAME;
-      let shaFileContents;
-
-      try {
-        shaFileContents = fs.readFileSync(packageUtil.SHA_FILE_NAME, {encoding: 'utf8'});
-        shaFileContents = shaFileContents.split('\n');
-
-        let updatedLine = false;
-
-        for (let x = 0; x < shaFileContents.length; x += 1) {
-          const line = shaFileContents[x];
-
-          if (line.split('  ')[1] === packageUtil.dynamicProps.BINARY_BUILD_NAME) {
-            shaFileContents[x] = newShaLine;
-            updatedLine = true;
-            break;
-          }
-        }
-
-        if (!updatedLine) {
-          shaFileContents.splice(shaFileContents.length - 1, 0, newShaLine);
-        }
-
-        shaFileContents = shaFileContents.join('\n');
-      } catch (err) {
-        shaFileContents = newShaLine + '\n';
-      }
-
-      fs.writeFileSync(packageUtil.SHA_FILE_NAME, shaFileContents);
-
-      let stats = fs.statSync(licensePath);
-      let licenseSize = stats.size.toString();
-
-      let zerosToAppend = packageUtil.LICENSE_HEADER_BYTES - licenseSize.length;
-      let paddedZeros = '';
-
-      for (let x = 0; x < zerosToAppend; x += 1) {
-        paddedZeros += '0';
-      }
-
-      licenseSize = paddedZeros + licenseSize;
-
-      // The following line generates an error on Node.js 4.0, but not 4.8.5. Not sure
-      // when the correct API was added.
-      const licenseSizeBuf = Buffer.from(licenseSize, 'ascii');
-
-      tempReadable.push(licenseSizeBuf);
-    })
-    .then(() => {
-      return writeFileToReadable(licensePath, tempReadable);
-    })
-    .then(() => {
-      return writeFileToReadable(binaryPath, tempReadable);
-    })
-    .then(() => {
-      const ws = fs.createWriteStream(packageUtil.dynamicProps.PACKAGE_FILE_NAME);
-      const gzip = zlib.createGzip();
-      const filestream = tempReadable.pipe(gzip).pipe(ws);
-
-      tempReadable.push(null); // Signal the end of data in
-
-      filestream.on('close', () => {
-        console.log('Package created: ' + packageUtil.dynamicProps.PACKAGE_FILE_NAME);
-      });
-    })
-    .catch(err => {
-      console.log('Error creating package', err);
-    });
-}
-
-createPackage();

package/package/extractpackage.js

@@ -1,76 +0,0 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. */
-
-/******************************************************************************
- *
- * You may not use the identified files except in compliance with the Apache
- * License, Version 2.0 (the "License.")
- *
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * NAME
- *   extractpackage.js
- *
- * DESCRIPTION
- *   This script is a command-line interface to extract node-oracledb
- *   binaries from an available binary package, see
- *   https://oracle.github.io/node-oracledb/INSTALL.html
- *
- * USAGE
- *   Run this script like:
- *     node extractpackage.js path=oracledb-vX.Y.Z-node-vNN-platform-architecture.gz
- *   For example:
- *     node extractpackage.js path=oracledb-v2.0.14-node-v57-darwin-x64.gz
- *
- *   The extracted binary can be manually moved to the correct directory.
- *
- *****************************************************************************/
-
-'use strict';
-
-// This module is meant to be used with Node.js at the command line. It breaks
-// apart a custom file that combines the node-oracledb license and binary into
-// two separate files.
-
-const fs = require('fs');
-const packageUtil = require('./util.js');
-let packagePath;
-
-for (let x = 1; x < process.argv.length; x += 1) {
-  let argParts = process.argv[x].split('=');
-  let argName = argParts[0];
-  let argVal = argParts[1];
-
-  if (argName === 'path') {
-    packagePath = argVal;
-  }
-}
-
-if (packagePath === undefined) {
-  throw new Error('path must be specified: node extractpackage.js path=/path/to/package.gz');
-} else {
-  let stats = fs.statSync(packagePath);
-
-  if (!stats.isFile()) {
-    throw new Error('path did not resolve to a file');
-  }
-}
-
-packageUtil.extract({
-  packagePath: packagePath,
-  writeLicense: true
-})
-  .then(() => {
-    packageUtil.log('Package extracted');
-  })
-  .catch(err => {
-    packageUtil.error('Error extracting package');
-    packageUtil.error(err.message);
-  });

package/package/getversion.js

@@ -1,37 +0,0 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. */
-
-/******************************************************************************
- *
- * You may not use the identified files except in compliance with the Apache
- * License, Version 2.0 (the "License.")
- *
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * NAME
- *   getversion.js
- *
- * DESCRIPTION
- *   Extracts the version from the package.json file.
- *
- *****************************************************************************/
-
-'use strict';
-
-let packageJSON;
-
-try {
-  packageJSON = require('../package.json');
-} catch (err) {
-  throw new Error('package.json is required to extract the node-oracledb version number');
-}
-
-console.log(packageJSON.version);
-