def view(self):
"""create view and import layers"""
layer = QgsMapLayerRegistry.instance().mapLayer(self.current_layers[0])
uri = QgsDataSourceURI(layer.source())
mtch = re.match(r'(.+)_([^_]+)_rev_(head|\d+)', uri.schema())
schema = mtch.group(1)
assert (schema)
dlg = QDialog()
layout = QVBoxLayout(dlg)
button_box = QDialogButtonBox(dlg)
button_box.setStandardButtons(QDialogButtonBox.Cancel
| QDialogButtonBox.Ok)
button_box.accepted.connect(dlg.accept)
button_box.rejected.connect(dlg.reject)
pcur = versioning_base.Db(psycopg2.connect(self.pg_conn_info()))
pcur.execute("SELECT rev, commit_msg, branch, date, author "
"FROM " + schema + ".revisions")
revs = pcur.fetchall()
pcur.close()
tblw = QTableWidget(dlg)
tblw.setRowCount(len(revs))
tblw.setColumnCount(5)
tblw.setSortingEnabled(True)
tblw.setHorizontalHeaderLabels(
['Revision', 'Commit Message', 'Branch', 'Date', 'Author'])
tblw.verticalHeader().setVisible(False)
for i, rev in enumerate(revs):
for j, item in enumerate(rev):
tblw.setItem(i, j, QTableWidgetItem(str(item)))
layout.addWidget(tblw)
layout.addWidget(button_box)
dlg.resize(600, 300)
if not dlg.exec_():
return
rows = set()
for i in tblw.selectedIndexes():
rows.add(i.row())
for row in rows:
branch = revs[row][2]
rev = revs[row][0]
versioning_base.add_revision_view(uri.connectionInfo(), schema,
branch, rev)
grp_name = branch + ' revision ' + str(rev)
grp_idx = self.iface.legendInterface().addGroup(grp_name)
for layer_id in reversed(self.current_layers):
layer = QgsMapLayerRegistry.instance().mapLayer(layer_id)
new_uri = QgsDataSourceURI(layer.source())
new_uri.setDataSource(
schema + '_' + branch + '_rev_' + str(rev),
new_uri.table(), new_uri.geometryColumn(), new_uri.sql(),
new_uri.keyColumn())
display_name = QgsMapLayerRegistry.instance().mapLayer(
layer_id).name()
src = new_uri.uri().replace('()', '')
new_layer = self.iface.addVectorLayer(src, display_name,
'postgres')
self.iface.legendInterface().moveLayer(new_layer, grp_idx)
from pyspatialite import dbapi2
import psycopg2
import os
import shutil
test_data_dir = os.path.dirname(os.path.realpath(__file__))
tmp_dir = "/tmp"
# create the test database
os.system("dropdb epanet_test_db")
os.system("createdb epanet_test_db")
os.system("psql epanet_test_db -c 'CREATE EXTENSION postgis'")
pg_conn_info = "dbname=epanet_test_db"
pcur = versioning_base.Db(psycopg2.connect(pg_conn_info))
pcur.execute("CREATE SCHEMA epanet")
pcur.execute("""
CREATE TABLE epanet.junctions (
hid serial PRIMARY KEY,
id varchar,
elevation float,
base_demand_flow float,
demand_pattern_id varchar,
geometry geometry('POINT',2154),
geometry_schematic geometry('POLYGON',2154)
)""")
pcur.execute("""
INSERT INTO epanet.junctions
(id, elevation, geometry, geometry_schematic)
import psycopg2
import os
import shutil
test_data_dir = os.path.dirname(os.path.realpath(__file__))
tmp_dir = "/tmp"
# create the test database
os.system("dropdb epanet_test_db")
os.system("createdb epanet_test_db")
os.system("psql epanet_test_db -c 'CREATE EXTENSION postgis'")
os.system("psql epanet_test_db -f "+test_data_dir+"/epanet_test_db_unversioned.sql")
versioning_base.historize("dbname=epanet_test_db","epanet")
# try the update
wc = tmp_dir+"/bug_in_branch_after_commit_wc.sqlite"
if os.path.isfile(wc): os.remove(wc)
versioning_base.checkout("dbname=epanet_test_db", ['epanet_trunk_rev_head.junctions', 'epanet_trunk_rev_head.pipes'], wc)
scur = versioning_base.Db( dbapi2.connect( wc ) )
scur.execute("SELECT * FROM pipes")
scur.execute("UPDATE pipes_view SET length = 1 WHERE OGC_FID = 1")
scur.commit()
versioning_base.commit(wc,'test', "dbname=epanet_test_db" )
versioning_base.add_branch("dbname=epanet_test_db","epanet","mybranch","add 'branch")
os.system("dropdb epanet_test_db")
os.system("createdb epanet_test_db")
os.system("psql epanet_test_db -c 'CREATE EXTENSION postgis'")
os.system("psql epanet_test_db -f " + test_data_dir + "/epanet_test_db.sql")
# chechout
#tables = ['epanet_trunk_rev_head.junctions','epanet_trunk_rev_head.pipes']
tables = ['epanet_trunk_rev_head.junctions', 'epanet_trunk_rev_head.pipes']
versioning_base.pg_checkout("dbname=epanet_test_db", tables,
"epanet_working_copy")
versioning_base.pg_checkout("dbname=epanet_test_db", tables,
"epanet_working_copy_cflt")
pcur = versioning_base.Db(psycopg2.connect("dbname=epanet_test_db"))
pcur.execute(
"INSERT INTO epanet_working_copy.pipes_view(id, start_node, end_node, geom) VALUES ('2','1','2',ST_GeometryFromText('LINESTRING(1 1,0 1)',2154))"
)
pcur.execute(
"INSERT INTO epanet_working_copy.pipes_view(id, start_node, end_node, geom) VALUES ('3','1','2',ST_GeometryFromText('LINESTRING(1 -1,0 1)',2154))"
)
pcur.commit()
prtHid(pcur, 'epanet_working_copy.pipes_view')
pcur.execute("SELECT pid FROM epanet_working_copy.pipes_view")
assert (len(pcur.fetchall()) == 3)
pcur.execute("SELECT pid FROM epanet_working_copy.pipes_diff")
assert (len(pcur.fetchall()) == 2)
def view(self):
"""create view and import layers"""
layer = QgsMapLayerRegistry.instance().mapLayer(self.current_layers[0])
uri = QgsDataSourceURI(layer.source())
mtch = re.match(r'(.+)_([^_]+)_rev_(head|\d+)', uri.schema())
schema = mtch.group(1)
assert (schema)
dlg = QDialog()
layout = QVBoxLayout(dlg)
button_box = QDialogButtonBox(dlg)
button_box.setStandardButtons(QDialogButtonBox.Cancel
| QDialogButtonBox.Ok)
button_box.accepted.connect(dlg.accept)
button_box.rejected.connect(dlg.reject)
user_msg1 = QgsMessageBar(dlg)
user_msg1.pushInfo(
"Select:", "one [many] for single [multiple] "
"revisions. Fetching may take time.")
pcur = versioning_base.Db(psycopg2.connect(self.pg_conn_info()))
pcur.execute("SELECT rev, commit_msg, branch, date, author "
"FROM " + schema + ".revisions")
revs = pcur.fetchall()
pcur.close()
tblw = QTableWidget(dlg)
tblw.setRowCount(len(revs))
tblw.setColumnCount(6)
tblw.setSortingEnabled(True)
tblw.setHorizontalHeaderLabels([
'Select', 'Revision', 'Commit Message', 'Branch', 'Date', 'Author'
])
tblw.verticalHeader().setVisible(False)
for i, rev in enumerate(revs):
for j, item in enumerate(rev):
chkBoxItem = QTableWidgetItem()
chkBoxItem.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsEnabled)
chkBoxItem.setCheckState(Qt.Unchecked)
tblw.setItem(i, 0, chkBoxItem)
tblw.setItem(i, j + 1, QTableWidgetItem(str(item)))
layout.addWidget(user_msg1)
layout.addWidget(tblw)
layout.addWidget(button_box)
dlg.resize(650, 300)
if not dlg.exec_():
return
rows = set()
revision_number_list = []
for i in range(len(revs)):
if tblw.item(i, 0).checkState():
print "Revision " + str(i + 1) + " will be fetched"
revision_number_list.append(i + 1)
rows.add(tblw.item(i, 0).row())
progressMessageBar = self.iface.messageBar().createMessage(
"Querying "
"the database for revision(s) " + str(revision_number_list))
progress = QProgressBar()
progress.setMaximum(len(rows))
progress.setAlignment(Qt.AlignLeft | Qt.AlignVCenter)
progressMessageBar.layout().addWidget(progress)
self.iface.messageBar().pushWidget(progressMessageBar,
self.iface.messageBar().INFO)
progress.setValue(0)
for i, row in enumerate(rows):
progress.setValue(i + 1)
branch = revs[row][2]
rev = revs[row][0]
versioning_base.add_revision_view(uri.connectionInfo(), schema,
branch, rev)
grp_name = branch + ' revision ' + str(rev)
grp_idx = self.iface.legendInterface().addGroup(grp_name)
for layer_id in reversed(self.current_layers):
layer = QgsMapLayerRegistry.instance().mapLayer(layer_id)
new_uri = QgsDataSourceURI(layer.source())
new_uri.setDataSource(
schema + '_' + branch + '_rev_' + str(rev),
new_uri.table(), new_uri.geometryColumn(), new_uri.sql(),
new_uri.keyColumn())
display_name = QgsMapLayerRegistry.instance().mapLayer(
layer_id).name()
src = new_uri.uri().replace('()', '')
new_layer = self.iface.addVectorLayer(src, display_name,
'postgres')
self.iface.legendInterface().moveLayer(new_layer, grp_idx)
self.iface.messageBar().clearWidgets()
def branch(self):
"""create branch and import layers"""
layer = QgsMapLayerRegistry.instance().mapLayer(self.current_layers[0])
uri = QgsDataSourceURI(layer.source())
mtch = re.match(r'(.+)_([^_]+)_rev_(head|\d+)', uri.schema())
schema = mtch.group(1)
base_branch = mtch.group(2)
base_rev = mtch.group(3)
assert (schema)
dlg = QDialog()
dlg.setWindowTitle('Enter branch name')
layout = QVBoxLayout(dlg)
button_box = QDialogButtonBox(dlg)
button_box.setStandardButtons(QDialogButtonBox.Cancel
| QDialogButtonBox.Ok)
button_box.accepted.connect(dlg.accept)
button_box.rejected.connect(dlg.reject)
line_edit = QLineEdit(dlg)
layout.addWidget(line_edit)
layout.addWidget(button_box)
if not dlg.exec_():
return
branch = line_edit.text()
if not branch:
print 'aborted'
return
pcur = versioning_base.Db(psycopg2.connect(self.pg_conn_info()))
pcur.execute("SELECT * FROM " + schema + ".revisions "
"WHERE branch = '" + branch + "'")
if pcur.fetchone():
pcur.close()
QMessageBox.warning(self.iface.mainWindow(), "Warning",
"Branch " + branch + ' already exists.')
return
pcur.close()
# get the commit message
# get rid of the combobox asking for the pg username of committer
self.q_commit_msg_dlg.pg_users_combobox.setVisible(False)
self.q_commit_msg_dlg.pg_username_label.setVisible(False)
if not self.q_commit_msg_dlg.exec_():
return
commit_msg = self.q_commit_msg_dlg.commitMessage.document(
).toPlainText()
if not commit_msg:
QMessageBox.warning(self.iface.mainWindow(), "Warning",
"No commit message, aborting commit")
print "aborted"
return
versioning_base.add_branch(uri.connectionInfo(), schema, branch,
commit_msg, base_branch, base_rev)
grp_name = branch + ' revision head'
grp_idx = self.iface.legendInterface().addGroup(grp_name)
for layer_id in reversed(self.current_layers):
layer = QgsMapLayerRegistry.instance().mapLayer(layer_id)
new_uri = QgsDataSourceURI(layer.source())
new_uri.setDataSource(schema + '_' + branch + '_rev_head',
new_uri.table(), new_uri.geometryColumn(),
new_uri.sql(), new_uri.keyColumn())
display_name = QgsMapLayerRegistry.instance().mapLayer(
layer_id).name()
new_layer = self.iface.addVectorLayer(
new_uri.uri().replace('()', ''), display_name, 'postgres')
self.iface.legendInterface().moveLayer(new_layer, grp_idx)
from pyspatialite import dbapi2
import psycopg2
import os
import shutil
test_data_dir = os.path.dirname(os.path.realpath(__file__))
tmp_dir = "/tmp"
# create the test database
os.system("dropdb epanet_test_db")
os.system("createdb epanet_test_db")
os.system("psql epanet_test_db -c 'CREATE EXTENSION postgis'")
pg_conn_info = "dbname=epanet_test_db"
pcur = versioning_base.Db(psycopg2.connect(pg_conn_info))
pcur.execute("CREATE SCHEMA epanet")
pcur.execute("""
CREATE TABLE epanet.junctions (
hid serial PRIMARY KEY,
id varchar,
elevation float,
base_demand_flow float,
demand_pattern_id varchar,
geom geometry('POINT',2154)
)""")
pcur.execute("""
INSERT INTO epanet.junctions
(id, elevation, geom)
VALUES
os.system("dropdb epanet_test_db")
os.system("createdb epanet_test_db")
os.system("psql epanet_test_db -c 'CREATE EXTENSION postgis'")
os.system("psql epanet_test_db -f " + test_data_dir + "/issue437_test_db.sql")
# try the update
wc = [tmp_dir + "/issue437_wc0.sqlite", tmp_dir + "/issue437_wc1.sqlite"]
for f in wc:
if os.path.isfile(f): os.remove(f)
versioning_base.checkout(
"dbname=epanet_test_db",
['epanet_trunk_rev_head.junctions', 'epanet_trunk_rev_head.pipes'], f)
scur = []
for f in wc:
scur.append(versioning_base.Db(dbapi2.connect(f)))
scur[0].execute(
"INSERT INTO pipes_view(id, start_node, end_node, GEOMETRY) VALUES ('2','1','2',GeomFromText('LINESTRING(1 1,0 1)',2154))"
)
scur[0].execute(
"INSERT INTO pipes_view(id, start_node, end_node, GEOMETRY) VALUES ('3','1','2',GeomFromText('LINESTRING(1 -1,0 1)',2154))"
)
scur[0].commit()
versioning_base.commit(wc[0], 'commit 1 wc0', "dbname=epanet_test_db")
versioning_base.update(wc[1], "dbname=epanet_test_db")
scur[0].execute("UPDATE pipes_view SET length = 1")
scur[0].commit()
scur[1].execute("UPDATE pipes_view SET length = 2")
