new package structure

src/main/scala/org/scalaquery/Fail.scala → src/main/scala/slaq/scalaquery/Fail.scala

@@ -1,4 +1,4 @@
-package org.scalaquery
+package slaq
 
 class Fail(msg: String, parent: Throwable) extends RuntimeException(msg, parent)
 object Fail {

src/main/scala/org/scalaquery/Invoker.scala → src/main/scala/slaq/scalaquery/Invoker.scala

@@ -1,10 +1,10 @@
-package org.scalaquery
+package slaq
 
 import scala.collection.immutable.Map
 import scala.collection.Factory
-import org.scalaquery.session.Session
-import org.scalaquery.util.CloseableIterator
-import org.scalaquery.iter._
+import slaq.session.Session
+import slaq.util.CloseableIterator
+import slaq.iter._
 
 /**
  * Base trait for all statement invokers, using parameter type P and result type R.

src/main/scala/org/scalaquery/MutatingInvoker.scala → src/main/scala/slaq/scalaquery/MutatingInvoker.scala

@@ -1,11 +1,11 @@
-package org.scalaquery
+package slaq
 
 import java.sql.PreparedStatement
-import org.scalaquery.session._
-import org.scalaquery.ql.Query
-import org.scalaquery.ql.core.Profile
-import org.scalaquery.util.{ValueLinearizer, NamingContext}
-import org.scalaquery.session.{PositionedParameters, PositionedResult}
+import slaq.session._
+import slaq.ql.Query
+import slaq.ql.core.Profile
+import slaq.util.{ValueLinearizer, NamingContext}
+import slaq.session.{PositionedParameters, PositionedResult}
 import scala.annotation.unchecked.{uncheckedVariance => uV}
 
 trait MutatingInvoker[-P, R] extends Invoker[P, R] { self =>

src/main/scala/org/scalaquery/ResultSetInvoker.scala → src/main/scala/slaq/scalaquery/ResultSetInvoker.scala

@@ -1,8 +1,8 @@
-package org.scalaquery
+package slaq
 
 import java.sql.ResultSet
-import org.scalaquery.session._
-import org.scalaquery.util.CloseableIterator
+import slaq.session._
+import slaq.util.CloseableIterator
 
 /**
  * An invoker which calls a function to retrieve a ResultSet. This can be used

src/main/scala/org/scalaquery/ResultSetMutator.scala → src/main/scala/slaq/scalaquery/ResultSetMutator.scala

@@ -1,4 +1,4 @@
-package org.scalaquery
+package slaq
 
 trait ResultSetMutator[T] {
 

src/main/scala/org/scalaquery/StatementInvoker.scala → src/main/scala/slaq/scalaquery/StatementInvoker.scala

@@ -1,10 +1,10 @@
-package org.scalaquery
+package slaq
 
 import java.sql.PreparedStatement
-import org.scalaquery.session._
-import org.scalaquery.util.CloseableIterator
+import slaq.session._
+import slaq.util.CloseableIterator
 
-import org.scalaquery.session.{
+import slaq.session.{
   ResultSetConcurrency => Concurrency,
   ResultSetHoldability => Holdability
 }

src/main/scala/org/scalaquery/iter/Iteratee.scala → src/main/scala/slaq/scalaquery/iter/Iteratee.scala

@@ -1,6 +1,6 @@
-package org.scalaquery.iter
+package slaq.iter
 
-import org.scalaquery.Fail
+import slaq.Fail
 
 /**
  * An iteratee for DB results.

src/main/scala/org/scalaquery/meta/CodeGen.scala → src/main/scala/slaq/scalaquery/meta/CodeGen.scala

@@ -1,7 +1,7 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.io.PrintWriter
-import org.scalaquery.session.Session
+import slaq.session.Session
 
 /**
  * Generate Scala code from database meta-data.

src/main/scala/org/scalaquery/meta/DatabaseMeta.scala → src/main/scala/slaq/scalaquery/meta/DatabaseMeta.scala

@@ -1,10 +1,10 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
 import java.lang.reflect.{Method, InvocationTargetException}
-import org.scalaquery.ResultSetInvoker
-import org.scalaquery.session._
-import org.scalaquery.simple.GetResult.GetString
+import slaq.ResultSetInvoker
+import slaq.session._
+import slaq.simple.GetResult.GetString
 
 /**
  * Accessor methods for various database meta data.

src/main/scala/org/scalaquery/meta/MAttribute.scala → src/main/scala/slaq/scalaquery/meta/MAttribute.scala

@@ -1,8 +1,8 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.ResultSetInvoker
-import org.scalaquery.ql.TypeMapperDelegate
+import slaq.ResultSetInvoker
+import slaq.ql.TypeMapperDelegate
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getAttributes().

src/main/scala/org/scalaquery/meta/MBestRowIdentifierColumn.scala → src/main/scala/slaq/scalaquery/meta/MBestRowIdentifierColumn.scala

@@ -1,8 +1,8 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.ResultSetInvoker
-import org.scalaquery.ql.TypeMapperDelegate
+import slaq.ResultSetInvoker
+import slaq.ql.TypeMapperDelegate
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getBestRowIdentifier().

src/main/scala/org/scalaquery/meta/MClientInfoProperty.scala → src/main/scala/slaq/scalaquery/meta/MClientInfoProperty.scala

@@ -1,7 +1,7 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.{ResultSetInvoker, UnitInvoker}
+import slaq.{ResultSetInvoker, UnitInvoker}
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getClientInfoProperties().

src/main/scala/org/scalaquery/meta/MColumn.scala → src/main/scala/slaq/scalaquery/meta/MColumn.scala

@@ -1,8 +1,8 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.ResultSetInvoker
-import org.scalaquery.ql.TypeMapperDelegate
+import slaq.ResultSetInvoker
+import slaq.ql.TypeMapperDelegate
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getColumns().

src/main/scala/org/scalaquery/meta/MForeignKey.scala → src/main/scala/slaq/scalaquery/meta/MForeignKey.scala

@@ -1,9 +1,9 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.{ResultSetInvoker, UnitInvoker}
-import org.scalaquery.ql.ForeignKeyAction
-import org.scalaquery.session._
+import slaq.{ResultSetInvoker, UnitInvoker}
+import slaq.ql.ForeignKeyAction
+import slaq.session._
 
 /**
  * A wrapper for a row in the ResultSet returned by

src/main/scala/org/scalaquery/meta/MFunction.scala → src/main/scala/slaq/scalaquery/meta/MFunction.scala

@@ -1,7 +1,7 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.{ResultSetInvoker, UnitInvoker}
+import slaq.{ResultSetInvoker, UnitInvoker}
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getFunctions().

src/main/scala/org/scalaquery/meta/MFunctionColumn.scala → src/main/scala/slaq/scalaquery/meta/MFunctionColumn.scala

@@ -1,8 +1,8 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.ResultSetInvoker
-import org.scalaquery.ql.TypeMapperDelegate
+import slaq.ResultSetInvoker
+import slaq.ql.TypeMapperDelegate
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getFunctionColumns().

src/main/scala/org/scalaquery/meta/MIndexInfo.scala → src/main/scala/slaq/scalaquery/meta/MIndexInfo.scala

@@ -1,6 +1,6 @@
-package org.scalaquery.meta
+package slaq.meta
 
-import org.scalaquery.ResultSetInvoker
+import slaq.ResultSetInvoker
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getIndexInfo().

src/main/scala/org/scalaquery/meta/MPrimaryKey.scala → src/main/scala/slaq/scalaquery/meta/MPrimaryKey.scala

@@ -1,6 +1,6 @@
-package org.scalaquery.meta
+package slaq.meta
 
-import org.scalaquery.{ResultSetInvoker, UnitInvoker}
+import slaq.{ResultSetInvoker, UnitInvoker}
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getPrimaryKeys().

src/main/scala/org/scalaquery/meta/MPrivilege.scala → src/main/scala/slaq/scalaquery/meta/MPrivilege.scala

@@ -1,7 +1,7 @@
-package org.scalaquery.meta
+package slaq.meta
 
-import org.scalaquery.ResultSetInvoker
-import org.scalaquery.session._
+import slaq.ResultSetInvoker
+import slaq.session._
 
 /**
  * A common privilege type which is used by MTablePrivilege and MColumnPrivilege.

src/main/scala/org/scalaquery/meta/MProcedure.scala → src/main/scala/slaq/scalaquery/meta/MProcedure.scala

@@ -1,7 +1,7 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.ResultSetInvoker
+import slaq.ResultSetInvoker
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getProcedures().

src/main/scala/org/scalaquery/meta/MProcedureColumn.scala → src/main/scala/slaq/scalaquery/meta/MProcedureColumn.scala

@@ -1,8 +1,8 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.ResultSetInvoker
-import org.scalaquery.ql.TypeMapperDelegate
+import slaq.ResultSetInvoker
+import slaq.ql.TypeMapperDelegate
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getProcedureColumns().

src/main/scala/org/scalaquery/meta/MQName.scala → src/main/scala/slaq/scalaquery/meta/MQName.scala

@@ -1,6 +1,6 @@
-package org.scalaquery.meta
+package slaq.meta
 
-import org.scalaquery.session.PositionedResult
+import slaq.session.PositionedResult
 
 /**
  * A qualified name with an optional catalog and schema.

src/main/scala/org/scalaquery/meta/MSchema.scala → src/main/scala/slaq/scalaquery/meta/MSchema.scala

@@ -1,7 +1,7 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.ResultSetInvoker
+import slaq.ResultSetInvoker
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getSchemas().

src/main/scala/org/scalaquery/meta/MSuperTable.scala → src/main/scala/slaq/scalaquery/meta/MSuperTable.scala

@@ -1,6 +1,6 @@
-package org.scalaquery.meta
+package slaq.meta
 
-import org.scalaquery.ResultSetInvoker
+import slaq.ResultSetInvoker
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getSuperTables().

src/main/scala/org/scalaquery/meta/MSuperType.scala → src/main/scala/slaq/scalaquery/meta/MSuperType.scala

@@ -1,6 +1,6 @@
-package org.scalaquery.meta
+package slaq.meta
 
-import org.scalaquery.ResultSetInvoker
+import slaq.ResultSetInvoker
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getSuperTypes().

src/main/scala/org/scalaquery/meta/MTable.scala → src/main/scala/slaq/scalaquery/meta/MTable.scala

@@ -1,6 +1,6 @@
-package org.scalaquery.meta
+package slaq.meta
 
-import org.scalaquery.{ResultSetInvoker, UnitInvoker}
+import slaq.{ResultSetInvoker, UnitInvoker}
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getTables().

src/main/scala/org/scalaquery/meta/MTypeInfo.scala → src/main/scala/slaq/scalaquery/meta/MTypeInfo.scala

@@ -1,8 +1,8 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.ResultSetInvoker
-import org.scalaquery.ql.TypeMapperDelegate
+import slaq.ResultSetInvoker
+import slaq.ql.TypeMapperDelegate
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getTypeInfo().

src/main/scala/org/scalaquery/meta/MUDT.scala → src/main/scala/slaq/scalaquery/meta/MUDT.scala

@@ -1,7 +1,7 @@
-package org.scalaquery.meta
+package slaq.meta
 
-import org.scalaquery.ResultSetInvoker
-import org.scalaquery.ql.TypeMapperDelegate
+import slaq.ResultSetInvoker
+import slaq.ql.TypeMapperDelegate
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getUDTs().

src/main/scala/org/scalaquery/meta/MVersionColumn.scala → src/main/scala/slaq/scalaquery/meta/MVersionColumn.scala

@@ -1,8 +1,8 @@
-package org.scalaquery.meta
+package slaq.meta
 
 import java.sql._
-import org.scalaquery.ResultSetInvoker
-import org.scalaquery.ql.TypeMapperDelegate
+import slaq.ResultSetInvoker
+import slaq.ql.TypeMapperDelegate
 
 /**
  * A wrapper for a row in the ResultSet returned by DatabaseMetaData.getVersionColumns().

src/main/scala/org/scalaquery/ql/Case.scala → src/main/scala/slaq/scalaquery/ql/Case.scala

@@ -1,7 +1,7 @@
-package org.scalaquery.ql
+package slaq.ql
 
-import org.scalaquery.util.{Node, BinaryNode}
-import org.scalaquery.Fail
+import slaq.util.{Node, BinaryNode}
+import slaq.Fail
 
 object Case {
 

src/main/scala/org/scalaquery/ql/ColumnBase.scala → src/main/scala/slaq/scalaquery/ql/ColumnBase.scala

@@ -1,9 +1,9 @@
-package org.scalaquery.ql
+package slaq.ql
 
-import org.scalaquery.Fail
-import org.scalaquery.ql.core.Profile
-import org.scalaquery.session.{PositionedResult, PositionedParameters}
-import org.scalaquery.util.{
+import slaq.Fail
+import slaq.ql.core.Profile
+import slaq.session.{PositionedResult, PositionedParameters}
+import slaq.util.{
   Node,
   UnaryNode,
   WithOp,

src/main/scala/org/scalaquery/ql/ColumnOps.scala → src/main/scala/slaq/scalaquery/ql/ColumnOps.scala

@@ -1,7 +1,7 @@
-package org.scalaquery.ql
+package slaq.ql
 
 import TypeMapper._
-import org.scalaquery.util.{Node, UnaryNode, BinaryNode}
+import slaq.util.{Node, UnaryNode, BinaryNode}
 
 trait ColumnOps[B1, P1] {
   protected val leftOperand: Node

src/main/scala/org/scalaquery/ql/Constraint.scala → src/main/scala/slaq/scalaquery/ql/Constraint.scala

@@ -1,6 +1,6 @@
-package org.scalaquery.ql
+package slaq.ql
 
-import org.scalaquery.util.{Node, BinaryNode}
+import slaq.util.{Node, BinaryNode}
 
 sealed trait Constraint
 

src/main/scala/org/scalaquery/ql/DDL.scala → src/main/scala/slaq/scalaquery/ql/DDL.scala

@@ -1,6 +1,6 @@
-package org.scalaquery.ql
+package slaq.ql
 
-import org.scalaquery.session.Session
+import slaq.session.Session
 
 /**
  * A DDL object contains the SQL statements for creating and dropping

src/main/scala/org/scalaquery/ql/Functions.scala → src/main/scala/slaq/scalaquery/ql/Functions.scala

@@ -1,4 +1,4 @@
-package org.scalaquery.ql
+package slaq.ql
 
 import java.sql.{Date, Time}
 import TypeMapper._

src/main/scala/org/scalaquery/ql/Index.scala → src/main/scala/slaq/scalaquery/ql/Index.scala

@@ -1,6 +1,6 @@
-package org.scalaquery.ql
+package slaq.ql
 
-import org.scalaquery.util.Node
+import slaq.util.Node
 
 /**
  * An index (or foreign key constraint with an implicit index).

src/main/scala/org/scalaquery/ql/Join.scala → src/main/scala/slaq/scalaquery/ql/Join.scala

@@ -1,6 +1,6 @@
-package org.scalaquery.ql
+package slaq.ql
 
-import org.scalaquery.util.{Node, BinaryNode}
+import slaq.util.{Node, BinaryNode}
 
 case class Join(
   left: Node,