Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: melezov/pgscala
base: 855ce9c128
...
head fork: melezov/pgscala
compare: 5d8fee7371
  • 2 commits
  • 10 files changed
  • 0 commit comments
  • 1 contributor
2  pgscala/cross-publish.bat
View
@@ -1,4 +1,4 @@
@echo off
echo Cross-publishing the project ...
-call "%~dp0sbt.bat" --no-jrebel %* clean +compile +publish
+call "%~dp0sbt.bat" --no-jrebel %* clean builder/run +builder/proxy +compile +publish
2  pgscala/cross-publish.sh
View
@@ -1,4 +1,4 @@
#!/bin/bash
echo Cross-publishing the project ...
-`dirname $0`/sbt.sh --no-jrebel "$@" clean +compile +publish
+`dirname $0`/sbt.sh --no-jrebel "$@" clean builder/run +builder/proxy +compile +publish
11 pgscala/src/main/scala/org/pgscala/PGCredentials.scala
View
@@ -1,9 +1,10 @@
package org.pgscala
case class PGCredentials(
- host: String
- , port: Int
- , dbName: String
- , user: String
- , pass: String
+ host: String
+, port: Int = 5432
+, dbName: String
+, user: String
+, password: String
+, sslMode: String = "require"
)
7 pgscala/src/main/scala/org/pgscala/PGScala.scala
View
@@ -89,6 +89,13 @@ class PGScala(con: java.sql.Connection) {
}
/**
+ * Query the database and discard the result.
+ */
+
+ def exec(query: String, params: ParamText[_]*): Unit =
+ qry(query, params: _*){ _ => }
+
+ /**
* Query one database tuple.
*/
2  pgscala/src/main/scala/org/pgscala/PGSimple.scala
View
@@ -13,5 +13,5 @@ class PGSimple(creds: PGCredentials) extends PGSimpleDataSource
setPortNumber(creds.port)
setDatabaseName(creds.dbName)
setUser(creds.user)
- setPassword(creds.pass)
+ setPassword(creds.password)
}
2  pool/cross-publish.bat
View
@@ -1,4 +1,4 @@
@echo off
echo Cross-publishing the project ...
-call "%~dp0sbt.bat" --no-jrebel %* clean +compile +publish
+call "%~dp0sbt.bat" --no-jrebel %* clean builder/run +builder/proxy +compile +publish
2  pool/cross-publish.sh
View
@@ -1,4 +1,4 @@
#!/bin/bash
echo Cross-publishing the project ...
-`dirname $0`/sbt.sh --no-jrebel "$@" clean +compile +publish
+`dirname $0`/sbt.sh --no-jrebel "$@" clean builder/run +builder/proxy +compile +publish
2  pool/src/main/scala/org/pgscala/PGPool.scala
View
@@ -12,7 +12,7 @@ class PGPool(creds: PGCredentials) extends PGSessionFactory {
format(creds.host, creds.port, creds.dbName))
cpds.setUser(creds.user)
- cpds.setPassword(creds.pass)
+ cpds.setPassword(creds.password)
cpds
}
34 project/PGScalaBuild.scala
View
@@ -12,21 +12,12 @@ object BuildSettings {
, initialCommands := "import org.pgscala.util._"
)
- val iorcVersion = "0.1.7"
-
val bsIORC = scalaSettings ++ Seq(
name := "pgscala-iorc"
- , version := iorcVersion
+ , version := "0.1.7"
, initialCommands := "import org.pgscala.iorc._"
- , crossScalaVersions := Seq(
- "2.9.2"
- , "2.9.0", "2.9.0-1", "2.9.1", "2.9.1-1", "2.9.3-RC2"
- //, "2.10.1-RC1"
- )
)
- lazy val iorcPublished = "org.pgscala" %% "pgscala-iorc" % iorcVersion
-
// ===========================================================================
val proxy = TaskKey[Unit]("proxy", "Compiles jasmin proxy methods (return type overloading for Scala)")
@@ -63,13 +54,14 @@ object BuildSettings {
val bsPGScala = scalaSettings ++ Seq(
name := "pgscala"
- , version := "0.7.21"
+ , version := "0.7.23"
, initialCommands := "import org.pgscala._"
)
val bsPool = scalaSettings ++ Seq(
name := "pgscala-pool"
- , version := "0.2.15"
+ , version := "0.2.16"
+ , initialCommands := "import org.pgscala._"
)
}
@@ -81,7 +73,7 @@ object Dependencies {
lazy val postgres = "postgresql" % "postgresql" % "9.2-1002.jdbc4"
- lazy val c3p0 = "c3p0" % "c3p0" % "0.9.1.2"
+ lazy val c3p0 = "com.mchange" % "c3p0" % "0.9.2"
lazy val slf4j = "org.slf4j" % "slf4j-api" % "1.7.2"
lazy val log4jOverSlf4j = "org.slf4j" % "log4j-over-slf4j" % "1.7.2"
@@ -89,7 +81,8 @@ object Dependencies {
lazy val logback = "ch.qos.logback" % "logback-classic" % "1.0.9"
lazy val scalaIo = (sV: String) =>
"com.github.scala-incubator.io" % "scala-io-file_".+(sV match {
- case "2.9.2" => "2.9.2"
+ case "2.9.2" | "2.9.3" => "2.9.2"
+ case x if x startsWith "2.10" => "2.10"
case x => "2.9.1"
}) % "0.4.1-seq"
@@ -154,9 +147,8 @@ object PGScalaBuild extends Build {
, slf4j
, scalaTest % "test"
, logback % "test"
- , iorcPublished
)
- ) dependsOn(util, pgscalaConverters)
+ ) dependsOn(util, iorc, pgscalaConverters)
lazy val pgscalaPool = Project(
"pool"
@@ -197,8 +189,8 @@ object Publishing {
import Repositories._
lazy val settings = Seq(
- publishTo <<= (version) { version => Some(
- if (version.endsWith("SNAPSHOT")) ElementSnapshots else ElementReleases
+ publishTo <<= version { version => Some(
+ if (version endsWith "SNAPSHOT") ElementSnapshots else ElementReleases
)}
, credentials += Credentials(Path.userHome / ".config" / "pgscala" / "nexus.config")
, publishArtifact in (Compile, packageDoc) := false
@@ -252,11 +244,9 @@ object Default {
Publishing.settings ++ Seq(
organization := "org.pgscala"
- , scalaVersion <<= crossScalaVersions(_.head)
+ , scalaVersion <<= crossScalaVersions(_.last)
, crossScalaVersions := Seq(
- "2.9.2"
- , "2.9.0", "2.9.0-1", "2.9.1", "2.9.1-1", "2.9.3-RC2"
- , "2.10.1-RC1"
+ "2.9.0", "2.9.0-1", "2.9.1", "2.9.1-1", "2.9.2", "2.9.3"
)
, scalacOptions <<= scalaVersion map ( sV => scala2_8 ++ (sV match {
case x if (x startsWith "2.10.") => scala2_9 ++ scala2_9_1 ++ scala2_10
4 project/plugins.sbt
View
@@ -20,11 +20,11 @@ libraryDependencies += "net.sf.jasmin" % "jasmin" % "2.4"
// | See also: Scala IDE downloads (http://download.scala-ide.org/) |
// +-------------------------------------------------------------------------------------+
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.1")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.2")
// +-------------------------------------------------------------------------------------+
// | Dependency graph SBT plugin (https://github.com/jrudolph/sbt-dependency-graph) |
// | Lists all library dependencies in a nicely formatted way for easy inspection. |
// +-------------------------------------------------------------------------------------+
-addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.0")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.1")

No commit comments for this range

Something went wrong with that request. Please try again.