Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fixed #101 ResultSQLProvider which uses an external SQLSyntax value #102

Merged
merged 16 commits into from

4 participants

Kazuhiro Sera BuildHive Toshiyuki Takahashi kenji yoshida
Kazuhiro Sera
Owner

No description provided.

BuildHive

Kazuhiro Sera » scalikejdbc #104 FAILURE
Looks like there's a problem with this pull request
(what's this?)

Kazuhiro Sera seratch merged commit 51e198b into from
Kazuhiro Sera seratch deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 20, 2013
  1. Toshiyuki Takahashi Kazuhiro Sera

    Fixed strange behavior of TypesafeConfigReader trait.

    tototoshi authored seratch committed
    Typesafeconfig trait was using TypesafeConfigReader object in #readJDBCSettings and #readConnectionPoolSettings. Because of this, TypesafeConfigReader#readJDBCSettings and #readConnectionPoolSettings couldn't load files other than application.conf.
  2. Toshiyuki Takahashi Kazuhiro Sera

    Fixed test

    tototoshi authored seratch committed
  3. Kazuhiro Sera

    Tried .sbtrc

    seratch authored
  4. Kazuhiro Sera

    Tried .sbtrc

    seratch authored
  5. Kazuhiro Sera
  6. Toshiyuki Takahashi Kazuhiro Sera

    Changed TypesafeConfigReader#readJDBCSettings to accept null user and…

    tototoshi authored seratch committed
    … password.
  7. kenji yoshida Kazuhiro Sera

    s/private/private[this]

    xuwei-k authored seratch committed
  8. Kazuhiro Sera

    Fixed dbconsole ignores an argument.

    Toshiyuki Takahashi authored seratch committed
    'if [ "$1" != "" ];' was always true because of 'shift' above.
  9. Kazuhiro Sera

    Added show method

    seratch authored
  10. Kazuhiro Sera
  11. Kazuhiro Sera
  12. Kazuhiro Sera
  13. Kazuhiro Sera

    Added warn logging

    seratch authored
  14. Kazuhiro Sera

    Fixed tests for concurrency

    seratch authored
  15. Kazuhiro Sera

    version 1.4.8

    seratch authored
  16. Kazuhiro Sera
This page is out of date. Refresh to see the latest.
Showing with 199 additions and 81 deletions.
  1. +67 −0 notes/1.4.8.markdown
  2. +1 −1  project/Build.scala
  3. +17 −18 scalikejdbc-cli/scripts/setup.sh
  4. +4 −4 scalikejdbc-config/src/main/scala/scalikejdbc/config/TypesafeConfigReader.scala
  5. +0 −2  scalikejdbc-config/src/test/resources/application.conf
  6. +27 −12 scalikejdbc-config/src/test/scala/scalikejdbc/config/TypesafeConfigReaderSpec.scala
  7. +17 −1 scalikejdbc-interpolation/src/main/scala/scalikejdbc/SQLInterpolation.scala
  8. +30 −18 scalikejdbc-interpolation/src/test/scala/scalikejdbc/SQLInterpolationSpec.scala
  9. +1 −1  scalikejdbc-library/src/main/scala/scalikejdbc/DB.scala
  10. +17 −3 scalikejdbc-library/src/main/scala/scalikejdbc/StringSQLRunner.scala
  11. +1 −1  scalikejdbc-library/src/main/scala/scalikejdbc/ThreadLocalDB.scala
  12. +11 −6 scalikejdbc-library/src/test/scala/scalikejdbc/ConnectionPoolSpec.scala
  13. +3 −0  scalikejdbc-library/src/test/scala/scalikejdbc/DBSessionSpec.scala
  14. +1 −0  scalikejdbc-library/src/test/scala/scalikejdbc/StringSQLRunnerSpec.scala
  15. +1 −1  scalikejdbc-mapper-generator/src/sbt-test/scalikejdbc-mapper-generator/gen/project/Build.scala
  16. +1 −1  scalikejdbc-mapper-generator/src/sbt-test/scalikejdbc-mapper-generator/gen/project/plugins.sbt
  17. +0 −12 scripts/run_all_tests.sh
67 notes/1.4.8.markdown
View
@@ -0,0 +1,67 @@
+ScalikeJDBC 1.4.8 has been released. Typesafe Config support and dbconsole are improved a lot thanks to @tototoshi. Interpolation is improved by @gakuzzzz.
+
+Here is the fixed issues in this version.
+
+https://github.com/seratch/scalikejdbc/issues?milestone=22&state=closed
+
+
+## library
+
+for Scala 2.10.0, 2.9.3, 2.9.2 and 2.9.1:
+
+ "com.github.seratch" %% "scalikejdbc" % "1.4.8"
+
+* Fixed [(GH-85)](https://github.com/seratch/scalikejdbc/issues/85) Need an easier way to pass parameters in dynamic SQL about bindByName (@tsuyoshizawa)
+* Added ConnectionPool.close() for cleaning up the default CP
+* Added DB.getAllTableNames()
+* Some internal improvements thanks to @xuwei-k
+
+## interpolation
+
+for Scala 2.10.0:
+
+ "com.github.seratch" %% "scalikejdbc-interpolation" % "1.4.8"
+
+* Added nested interpolation support by @gakuzzzz [(GH-87)](https://github.com/seratch/scalikejdbc/issues/87)
+* Added type compatibility between ResultName and PartialResultNameProvider by @gakuzzzz [(GH-94)](https://github.com/seratch/scalikejdbc/issues/94)
+
+## config
+
+Released for Scala 2.10.0, 2.9.3, 2.9.2 and 2.9.1:
+
+ "com.github.seratch" %% "scalikejdbc-config" % "1.4.8"
+
+* Fixed TypesafeConfigReader always calls the default reader method by @tototoshi [(GH-96)](https://github.com/seratch/scalikejdbc/issues/96)
+* Enabled TypesafeConfigReader to accept null username/password by @tototoshi [(GH-97)](https://github.com/seratch/scalikejdbc/issues/97)
+
+## test
+
+for Scala 2.10.0, 2.9.3, 2.9.2 and 2.9.1:
+
+ "com.github.seratch" %% "scalikejdbc-test" % "1.4.8"
+
+## mapper-generator
+
+for xsbt 0.12:
+
+ addSbtPlugin("com.github.seratch" %% "scalikejdbc-mapper-generator" % "1.4.8")
+
+## play-plugin
+
+for Play 2.1.x and 2.0.x:
+
+ "com.github.seratch" %% "scalikejdbc-play-plugin" % "1.4.8"
+
+## dbconsole
+
+ curl -L http://git.io/dbconsole | sh
+
+* Added useful profile selector by @tototoshi
+* Enabled users to customize intial commands by @tototoshi [(GH-91)](https://github.com/seratch/scalikejdbc/issues/91)
+* Bumped sbt version to 0.12.2
+* Deprecated update operations by #run (use #execute instead)
+
+
+Enjoy writing SQL and get things done!
+
+
2  project/Build.scala
View
@@ -7,7 +7,7 @@ object ScalikeJDBCProjects extends Build {
// [NOTE] Execute the following to bump version
// sbt "g version 1.3.8-SNAPSHOT"
- lazy val _version = "1.4.8-SNAPSHOT"
+ lazy val _version = "1.4.8"
lazy val scalikejdbc = Project(
id = "library",
35 scalikejdbc-cli/scripts/setup.sh
View
@@ -1,6 +1,7 @@
#!/bin/sh
-ROOT_DIR=${HOME}/bin/scalikejdbc-cli
+HOME_DIR=`echo $HOME | sed -e s/\\\\/$//`
+ROOT_DIR=${HOME_DIR}/bin/scalikejdbc-cli
mkdir -p ${ROOT_DIR}
CONFIG_PROPS=${ROOT_DIR}/config.properties
DBCONSOLE_COMMAND=${ROOT_DIR}/dbconsole
@@ -57,11 +58,11 @@ function run_sbt() {
}
function ltrim () {
- perl -pe '"'"'s/^\s*//'"'"'
+ perl -pe '"'"'s/^\s*//'"'"'
}
function ignore_comment() {
- perl -pe '"'"'s/^(.*?)#.*$/$1/'"'"'
+ perl -pe '"'"'s/^(.*?)#.*$/$1/'"'"'
}
function remove_blank_line() {
@@ -111,20 +112,18 @@ until [ -z "$1" ]; do
esac
done
-if [ "$1" != "" ]; then
- PROFILE=$1
-else
+if [ "$PROFILE" == "" ]; then
echo "Select a profile."
select INPUT in `collect_profile` EXIT
do
- if [ "$INPUT" == "EXIT" ]; then
- exit;
- fi
- PROFILE=$INPUT
- if [ "$INPUT" == "" ]; then
- continue
- fi
- break
+ if [ "$INPUT" == "EXIT" ]; then
+ exit;
+ fi
+ PROFILE=$INPUT
+ if [ "$INPUT" == "" ]; then
+ continue
+ fi
+ break
done || exit
fi
@@ -196,13 +195,13 @@ def tables = println(DB.showTables())
implicit val session: DBSession = AutoSession
' > ${INIT_SCRIPT}
-SHELL_PROFILE=${HOME}/.bash_profile
+SHELL_PROFILE=${HOME_DIR}/.bash_profile
if [[ "$SHELL" == *zsh* ]]; then
- SHELL_PROFILE=${HOME}/.zprofile
+ SHELL_PROFILE=${HOME_DIR}/.zprofile
fi
-if [ ! `grep 'PATH=${PATH}:${HOME}/bin/scalikejdbc-cli' ${SHELL_PROFILE}` ]; then
- echo "PATH=\${PATH}:\${HOME}/bin/scalikejdbc-cli" >> ${SHELL_PROFILE}
+if [ ! `grep 'PATH=${PATH}:${HOME_DIR}/bin/scalikejdbc-cli' ${SHELL_PROFILE}` ]; then
+ echo "PATH=\${PATH}:\${HOME_DIR}/bin/scalikejdbc-cli" >> ${SHELL_PROFILE}
fi
chmod +x ${DBCONSOLE_COMMAND}
8 scalikejdbc-config/src/main/scala/scalikejdbc/config/TypesafeConfigReader.scala
View
@@ -81,13 +81,13 @@ trait TypesafeConfigReader { self: TypesafeConfig =>
}
def readJDBCSettings(dbName: Symbol = ConnectionPool.DEFAULT_NAME): JDBCSettings = {
- val configMap = TypesafeConfigReader.readAsMap(dbName)
+ val configMap = self.readAsMap(dbName)
(for {
driver <- configMap.get("driver")
url <- configMap.get("url")
- user <- configMap.get("user")
- password <- configMap.get("password")
} yield {
+ val user = configMap.get("user").orNull[String]
+ val password = configMap.get("password").orNull[String]
JDBCSettings(driver, url, user, password)
}) getOrElse {
throw new ConfigurationException("Configuration error for database " + dbName + ". " + configMap.toString)
@@ -95,7 +95,7 @@ trait TypesafeConfigReader { self: TypesafeConfig =>
}
def readConnectionPoolSettings(dbName: Symbol = ConnectionPool.DEFAULT_NAME): ConnectionPoolSettings = {
- val configMap = TypesafeConfigReader.readAsMap(dbName)
+ val configMap = self.readAsMap(dbName)
val default = new ConnectionPoolSettings
ConnectionPoolSettings(
initialSize = configMap.get("poolInitialSize").map(_.toInt).getOrElse(default.initialSize),
2  scalikejdbc-config/src/test/resources/application.conf
View
@@ -27,8 +27,6 @@ db.bar.poolValidationQuery="select 1 as bar"
db.baz.url="jdbc:h2:mem:test4"
db.baz.driver="org.h2.Driver"
-db.baz.user="sa4"
-db.baz.password="secret4"
scalikejdbc.global.loggingSQLAndTime.enabled=true
scalikejdbc.global.loggingSQLAndTime.logLevel=debug
39 scalikejdbc-config/src/test/scala/scalikejdbc/config/TypesafeConfigReaderSpec.scala
View
@@ -7,6 +7,18 @@ import com.typesafe.config._
class TypesafeConfigReaderSpec extends FunSpec with ShouldMatchers {
+ val emptyConfigReader = new TypesafeConfigReader with TypesafeConfig {
+ override lazy val config: Config = ConfigFactory.load("empty.conf")
+ }
+
+ val badConfigReader = new TypesafeConfigReader with TypesafeConfig {
+ override lazy val config: Config = ConfigFactory.load("application-bad.conf")
+ }
+
+ val badConfigReaderLogEnabled = new TypesafeConfigReader with TypesafeConfig {
+ override lazy val config: Config = ConfigFactory.load("application-bad-logenabled.conf")
+ }
+
describe("TypesafeConfigReader") {
describe ("#readJDBCSettings") {
@@ -21,6 +33,21 @@ class TypesafeConfigReaderSpec extends FunSpec with ShouldMatchers {
TypesafeConfigReader.readJDBCSettings('foo) should be (expected)
}
+ describe ("When user and password is not specified in application.conf") {
+ it ("should return JDBCSettings the user and password of which is null") {
+ val expected = JDBCSettings("org.h2.Driver", "jdbc:h2:mem:test4", null, null)
+ TypesafeConfigReader.readJDBCSettings('baz) should be (expected)
+ }
+ }
+
+ describe ("When configuration file is empty") {
+ it ("throws Configuration Exception") {
+ intercept[ConfigurationException] {
+ emptyConfigReader.readJDBCSettings('foo) should be (None)
+ }
+ }
+ }
+
describe ("When an unknown database name is passed") {
it ("throws Configuration Exception") {
intercept[ConfigurationException] {
@@ -87,18 +114,6 @@ class TypesafeConfigReaderSpec extends FunSpec with ShouldMatchers {
}
- val emptyConfigReader = new TypesafeConfigReader with TypesafeConfig {
- override lazy val config: Config = ConfigFactory.load("empty.conf")
- }
-
- val badConfigReader = new TypesafeConfigReader with TypesafeConfig {
- override lazy val config: Config = ConfigFactory.load("application-bad.conf")
- }
-
- val badConfigReaderLogEnabled = new TypesafeConfigReader with TypesafeConfig {
- override lazy val config: Config = ConfigFactory.load("application-bad-logenabled.conf")
- }
-
describe ("#loadGlobalSettings") {
it ("should load global settings") {
18 scalikejdbc-interpolation/src/main/scala/scalikejdbc/SQLInterpolation.scala
View
@@ -25,7 +25,11 @@ object SQLInterpolation {
*/
trait SQLSyntaxSupport[A] {
- def tableName: String
+ def tableName: String = {
+ val className = this.getClass.getName.replaceFirst("\\$$", "").replaceFirst("^.+\\.", "").replaceFirst("^.+\\$", "")
+ SQLSyntaxProvider.toSnakeCase(className)
+ }
+
def columns: Seq[String] = SQLSyntaxSupportLoadedColumns.getOrElseUpdate(tableName, DB.getColumnNames(tableName).map(_.toLowerCase))
def forceUpperCase: Boolean = false
@@ -171,12 +175,24 @@ object SQLInterpolation {
s"${tableAliasName}.${c.value} as ${name}${delimiterForResultName}${tableAliasName}"
}.mkString(", "))
+ def apply(syntax: SQLSyntax): PartialResultSQLSyntaxProvider[S, A] = PartialResultSQLSyntaxProvider(support, tableAliasName, syntax)
+
def column(name: String): SQLSyntax = columns.find(_.value.toLowerCase == name.toLowerCase).map { c =>
val name = if (support.useShortenedResultName) toShortenedName(c.value, support.columns) else c.value
SQLSyntax(s"${tableAliasName}.${c.value} as ${name}${delimiterForResultName}${tableAliasName}")
}.getOrElse(throw notFoundInColumns(tableAliasName, name))
}
+ case class PartialResultSQLSyntaxProvider[S <: SQLSyntaxSupport[A], A](support: S, aliasName: String, syntax: SQLSyntax)
+ extends SQLSyntaxProviderCommonImpl[S, A](support, aliasName) {
+ import SQLSyntaxProvider._
+
+ def column(name: String): SQLSyntax = columns.find(_.value.toLowerCase == name.toLowerCase).map { c =>
+ val name = if (support.useShortenedResultName) toShortenedName(c.value, support.columns) else c.value
+ SQLSyntax(s"${syntax.value} as ${name}${delimiterForResultName}${aliasName}", syntax.parameters)
+ }.getOrElse(throw notFoundInColumns(aliasName, name))
+ }
+
/**
* SQLSyntax provider for result names
*/
48 scalikejdbc-interpolation/src/test/scala/scalikejdbc/SQLInterpolationSpec.scala
View
@@ -273,10 +273,7 @@ class SQLInterpolationSpec extends FlatSpec with ShouldMatchers {
}
case class Issue(id: Int, body: String, tags: Seq[Tag] = Vector())
-
object Issue extends SQLSyntaxSupport[Issue] {
- override val tableName = "issues"
- override val columns = Seq("id", "body")
def apply(rs: WrappedResultSet, i: ResultName[Issue]): Issue = Issue(
id = rs.int(i.id),
body = rs.string(i.body)
@@ -284,33 +281,37 @@ class SQLInterpolationSpec extends FlatSpec with ShouldMatchers {
}
case class Tag(id: Int, name: String)
-
object Tag extends SQLSyntaxSupport[Tag] {
- override val tableName = "tags"
- override val columns = Seq("id", "name")
def apply(rs: WrappedResultSet, t: ResultName[Tag]): Tag = Tag(
id = rs.int(t.id),
name = rs.string(t.name)
)
}
- object IssueTag extends SQLSyntaxSupport[Nothing] {
- override val tableName = "issue_tag"
- override val columns = Seq("issue_id", "tag_id")
+ object IssueTag extends SQLSyntaxSupport[Nothing]
+
+ case class IssueSummary(count: Long, sum: Long)
+ object IssueSummary extends SQLSyntaxSupport[IssueSummary] {
+ override val columns = Seq("count", "sum")
+ def apply(is: ResultName[IssueSummary])(rs: WrappedResultSet) = new IssueSummary(rs.long(is.count), rs.long(is.sum))
}
it should "be available for empty relation" in {
+ DB autoCommit { implicit s =>
+ try {
+ sql"create table issue (id int not null, body varchar(256) not null)".execute.apply()
+ sql"create table tag (id int not null, name varchar(256) not null)".execute.apply()
+ sql"create table issue_tag (issue_id int not null, tag_id int not null)".execute.apply()
+ } catch { case e: Exception => }
+ }
DB localTx {
implicit s =>
try {
- sql"create table issues (id int not null, body varchar(256) not null)".execute.apply()
- sql"create table tags (id int not null, name varchar(256) not null)".execute.apply()
- sql"create table issue_tag (issue_id int not null, tag_id int not null)".execute.apply()
- sql"insert into issues values (1, ${"Alice"})".update.apply()
- sql"insert into issues values (2, ${"Bob"})".update.apply()
- sql"insert into issues values (3, ${"Chris"})".update.apply()
- sql"insert into issues values (4, ${"Dennis"})".update.apply()
+ sql"insert into issue values (1, ${"Alice"})".update.apply()
+ sql"insert into issue values (2, ${"Bob"})".update.apply()
+ sql"insert into issue values (3, ${"Chris"})".update.apply()
+ sql"insert into issue values (4, ${"Dennis"})".update.apply()
{
val (i, it, t) = (Issue.syntax("i"), IssueTag.syntax("it"), Tag.syntax("t"))
@@ -354,9 +355,20 @@ class SQLInterpolationSpec extends FlatSpec with ShouldMatchers {
issue.map(i => i.id) should equal(Some(1))
}
+ {
+ val (i, is) = (Issue.syntax("i"), IssueSummary.syntax("is"))
+ val idCount = sqls"count(${i.resultName.id})"
+ val idSum = sqls"sum(${i.resultName.id})"
+ val summary = sql"""
+ select ${is.result(idCount).count}, ${is.result(idSum).sum} from (select ${i.result.id} from ${Issue.as(i)})
+ """.map(IssueSummary(is.resultName)).single.apply().get
+ summary.count should equal(4)
+ summary.sum should equal(10)
+ }
+
} finally {
- sql"drop table issues".execute.apply()
- sql"drop table tags".execute.apply()
+ sql"drop table issue".execute.apply()
+ sql"drop table tag".execute.apply()
sql"drop table issue_tag".execute.apply()
}
}
2  scalikejdbc-library/src/main/scala/scalikejdbc/DB.scala
View
@@ -598,7 +598,7 @@ case class DB(conn: Connection) extends LogSupport {
}
}
- private val rollbackIfThrowable = handling(classOf[Throwable]) by { t =>
+ private[this] val rollbackIfThrowable = handling(classOf[Throwable]) by { t =>
tx.rollback()
throw t
}
20 scalikejdbc-library/src/main/scala/scalikejdbc/StringSQLRunner.scala
View
@@ -30,7 +30,7 @@ package scalikejdbc
*
* @param sql SQL value
*/
-case class StringSQLRunner(sql: String) {
+case class StringSQLRunner(sql: String) extends LogSupport {
/**
* Runs all SQL and returns result as List[Map[String, Any]]
@@ -41,11 +41,25 @@ case class StringSQLRunner(sql: String) {
SQL(sql).map(_.toMap()).list.apply()
} catch {
case e: java.sql.SQLException =>
- val result = SQL(sql).execute.apply()
- List(Map("RESULT" -> result))
+ val result = List(Map("RESULT" -> SQL(sql).execute.apply()))
+ log.warn("The execution failed in read-only mode first, then was rerun in auto-commit mode. Using #execute from the first is highly recommended.")
+ result
}
/**
+ * Runs all SQL and returns result as List[Map[String, Any]]
+ * @param session DB Session
+ * @return results as Boolean
+ */
+ def execute()(implicit session: DBSession = AutoSession): Boolean = SQL(sql).execute.apply()
+
+ /**
+ * Shows all the result
+ * @param session DB Session
+ */
+ def show()(implicit session: DBSession = AutoSession): Unit = run().foreach(println)
+
+ /**
* Casts value to expected type value
*
* TODO: ClassManifest will be deprecated since Scala 2.10.0
2  scalikejdbc-library/src/main/scala/scalikejdbc/ThreadLocalDB.scala
View
@@ -23,7 +23,7 @@ import java.sql.Connection
*/
object ThreadLocalDB {
- private val _db = new DynamicVariable[DB](null)
+ private[this] val _db = new DynamicVariable[DB](null)
/**
* Creates a new DB instance for the current thread.
17 scalikejdbc-library/src/test/scala/scalikejdbc/ConnectionPoolSpec.scala
View
@@ -27,13 +27,18 @@ class ConnectionPoolSpec extends FlatSpec with ShouldMatchers {
ConnectionPool.add('secondary, url, user, password, poolSettings)
ConnectionPool.borrow('secondary) should not be (null)
- // close default connection
- ConnectionPool.close()
- intercept[java.lang.IllegalStateException] { ConnectionPool.borrow() }
+ ConnectionPool.synchronized {
+ // close default connection
+ ConnectionPool.close()
+ intercept[java.lang.IllegalStateException] { ConnectionPool.borrow() }
- // close secondary connection
- ConnectionPool.close('secondary)
- intercept[java.lang.IllegalStateException] { ConnectionPool.borrow('secondary) }
+ // close secondary connection
+ ConnectionPool.close('secondary)
+ intercept[java.lang.IllegalStateException] { ConnectionPool.borrow('secondary) }
+
+ // recover for concurrent tests
+ ConnectionPool.singleton(url, user, password, poolSettings)
+ }
}
it should "be acceptable external ConnectionPoolFactory" in {
3  scalikejdbc-library/src/test/scala/scalikejdbc/DBSessionSpec.scala
View
@@ -430,6 +430,9 @@ class DBSessionSpec extends FlatSpec with ShouldMatchers with BeforeAndAfter wit
}
+ // clean table
+ SQL("delete from dbsessionspec_dateTimeValues").update.apply()
+
SQL("""
insert into dbsessionspec_dateTimeValues
(date_value, time_value, timestamp_value)
1  scalikejdbc-library/src/test/scala/scalikejdbc/StringSQLRunnerSpec.scala
View
@@ -21,6 +21,7 @@ class StringSQLRunnerSpec extends FlatSpec with ShouldMatchers with Settings {
// run insert SQL
("insert into " + tableName + " values (3, 'Ben')").run
+ ("insert into " + tableName + " values (4, 'Chris')").execute
// run select SQL
val result = ("select id,name from " + tableName + " where id = 3").run
2  scalikejdbc-mapper-generator/src/sbt-test/scalikejdbc-mapper-generator/gen/project/Build.scala
View
@@ -33,7 +33,7 @@ object AppBuild extends Build {
),
libraryDependencies <++= (scalaVersion) { scalaVersion =>
Seq(
- "com.github.seratch" %% "scalikejdbc" % "1.4.8-SNAPSHOT",
+ "com.github.seratch" %% "scalikejdbc" % "1.4.8",
"org.slf4j" % "slf4j-simple" % "1.6.4",
"org.hsqldb" % "hsqldb" % "[2,)",
"org.scalatest" %% "scalatest" % "[1.7,)" % "test"
2  scalikejdbc-mapper-generator/src/sbt-test/scalikejdbc-mapper-generator/gen/project/plugins.sbt
View
@@ -5,5 +5,5 @@ resolvers ++= Seq(
libraryDependencies += "org.hsqldb" % "hsqldb" % "[2,)"
-addSbtPlugin("com.github.seratch" %% "scalikejdbc-mapper-generator" % "1.4.8-SNAPSHOT")
+addSbtPlugin("com.github.seratch" %% "scalikejdbc-mapper-generator" % "1.4.8")
12 scripts/run_all_tests.sh
View
@@ -30,15 +30,3 @@ echo "-------------------"
echo
./run_tests.sh postgresql
-sbt "project library" \
- "set scalaVersion := \"2.9.2\"" \
- "set scalaBinaryVersion := \"2.9.2\"" \
- "project mapper-generator" test \
- "project play-plugin" test \
- "project config" test \
- "project test" test \
- "project library" \
- "set scalaVersion := \"2.10.0\"" \
- "set scalaBinaryVersion := \"2.10\"" \
- "project interpolation" test
-
Something went wrong with that request. Please try again.